get down to support lib 25.1.0

25.2.0 is not yet supported by fdroid

.github/CONTRIBUTING.md

@@ -13,6 +13,9 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
 * Check if this issue/feature is already fixed/implemented in the repository
 * If you are an android/java developer you are always welcome to fix/implement an issue/a feature yourself
 
+## Bugfixing
+* If you want to help NewPipe getting bug free, you can send me a mail to tnp@newpipe.schabi.org to let me know that you intent to help, and than register at our [sentry](https://support.schabi.org) setup. 
+
 ## Translation
 
 * NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
@@ -31,6 +34,6 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
 
 ## Communication
 
-* I hereby declare our Slack channel as dead!!! There are no plans on building a new chat, but if there is interest on creating one and keeping it alive, I'd be pleased to create one again. 
+* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
 * If you want to get in contact with me or one of our other contributors you can send me an email at tnp(at)schabi.org
 * Feel free to post suggestions, changes, ideas etc!

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/java/org/schabi/newpipe/extractor"]
+	path = app/src/main/java/org/schabi/newpipe/extractor
+	url = https://github.com/TeamNewPipe/NewPipeExtractor.git

README.md

@@ -37,12 +37,12 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
 * Download videos 
-* Download audio only 
-* Open a video in Kodi
+* Download audio only * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
 * Watch age restricted material
 * Display general information about channels
+* Search channels
 
 ### Coming Features
 
@@ -50,7 +50,6 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Bookmarks
 * View history
 * Search history
-* Search channels
 * Subscribe to channels
 * Watch videos from a channel
 * Search/Watch Playlists

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 23
-        versionName "0.8.9"
+        versionCode 25
+        versionName "0.8.11"
     }
     buildTypes {
         release {
@@ -32,10 +32,10 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:support-v4:25.1.1'
-    compile 'com.android.support:design:25.1.1'
-    compile 'com.android.support:recyclerview-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'
@@ -45,7 +45,8 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.nononsenseapps:filepicker:3.0.0'
+    compile 'ch.acra:acra:4.9.0'
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    compile 'ch.acra:acra:4.9.0'
+    testCompile 'org.json:json:20160810'
 }

app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorLiveStreamTest.java

@@ -1,52 +0,0 @@
-package org.schabi.newpipe.extractor.youtube;
-
-import android.test.AndroidTestCase;
-
-
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 11.03.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeStreamExtractorLiveStreamTest.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-public class YoutubeStreamExtractorLiveStreamTest extends AndroidTestCase {
-
-    private StreamExtractor extractor;
-
-    public void setUp() throws IOException, ExtractionException {
-        //todo: make the extractor not throw over a livestream
-        /*
-
-        NewPipe.init(Downloader.getInstance());
-        extractor = NewPipe.getService("Youtube")
-                .getExtractorInstance("https://www.youtube.com/watch?v=J0s6NjqdjLE", Downloader.getInstance());
-                */
-    }
-
-    public void testStreamType() throws ParsingException {
-        assertTrue(true);
-        // assertTrue(extractor.getStreamType() == AbstractVideoInfo.StreamType.LIVE_STREAM);
-    }
-}
-

app/src/main/AndroidManifest.xml

@@ -16,7 +16,6 @@
         android:logo="@mipmap/ic_launcher"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
-
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
@@ -34,53 +33,6 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="youtube.com" />
-                <data android:host="m.youtube.com" />
-                <data android:host="www.youtube.com" />
-                <data android:pathPrefix="/v/" />
-                <data android:pathPrefix="/watch" />
-                <data android:pathPrefix="/attribution_link" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:host="youtu.be" />
-                <data android:pathPrefix="/" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="vnd.youtube" />
-                <data android:scheme="vnd.youtube.launch" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".player.PlayVideoActivity"
@@ -149,15 +101,11 @@
         <activity
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
             android:label="@string/app_name"
-            android:theme="@style/FilePickerTheme"
-            android:launchMode="singleTop">
-        </activity>
-
+            android:launchMode="singleTop"
+            android:theme="@style/FilePickerTheme"/>
         <activity
             android:name=".ChannelActivity"
-            android:label="@string/title_activity_channel"
-            android:theme="@style/AppTheme.NoActionBar" />
-
+            android:launchMode="singleTask" />
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity" />
@@ -169,8 +117,64 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
+
+        <activity android:name=".RouterActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <!-- video prefix -->
+                <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/watch" />
+                <data android:pathPrefix="/attribution_link" />
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="vnd.youtube" />
+                <data android:scheme="vnd.youtube.launch" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

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

@@ -4,22 +4,21 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -30,9 +29,12 @@ import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.ErrorActivity;
-
+import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.NavStack;
 import java.io.IOException;
-import java.util.Objects;
+import static android.os.Build.VERSION.SDK_INT;
+import org.schabi.newpipe.util.ThemeHelper;
+
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -53,15 +55,9 @@ import java.util.Objects;
  */
 
 public class ChannelActivity extends AppCompatActivity {
-
-
     private static final String TAG = ChannelActivity.class.toString();
     private View rootView = null;
 
-    // intent const
-    public static final String CHANNEL_URL = "channel_url";
-    public static final String SERVICE_ID = "service_id";
-
     private int serviceId = -1;
     private String channelUrl = "";
     private int pageNumber = 0;
@@ -71,35 +67,43 @@ public class ChannelActivity extends AppCompatActivity {
     private ImageLoader imageLoader = ImageLoader.getInstance();
     private InfoListAdapter infoListAdapter = null;
 
+    private String subS = "";
+
+    ProgressBar progressBar = null;
+    ImageView channelBanner = null;
+    ImageView avatarView = null;
+    TextView titleView = null;
+    TextView subscirberView = null;
+    Button subscriberButton = null;
+    View subscriberLayout = null;
+
+    View header = null;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", getResources().getString(R.string.light_theme_title)).
-                        equals(getResources().getString(R.string.dark_theme_title)))  {
-            setTheme(R.style.DarkTheme_NoActionBar);
-        }
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_channel);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        rootView = findViewById(R.id.rootView);
-        setSupportActionBar(toolbar);
-        Intent i = getIntent();
-        channelUrl = i.getStringExtra(CHANNEL_URL);
-        serviceId = i.getIntExtra(SERVICE_ID, -1);
+        rootView = findViewById(android.R.id.content);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(true);
 
         infoListAdapter = new InfoListAdapter(this, rootView);
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.channel_streams_view);
         final LinearLayoutManager layoutManager = new LinearLayoutManager(this);
         recyclerView.setLayoutManager(layoutManager);
+        header = getLayoutInflater().inflate(R.layout.channel_header, recyclerView, false);
+        infoListAdapter.setHeader(header);
+        infoListAdapter.setFooter(
+                getLayoutInflater().inflate(R.layout.pignate_footer, recyclerView, false));
         recyclerView.setAdapter(infoListAdapter);
-        infoListAdapter.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+        infoListAdapter.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
             @Override
-            public void selected(String url) {
-                Intent detailIntent = new Intent(ChannelActivity.this, VideoItemDetailActivity.class);
-                detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
-                detailIntent.putExtra(
-                        VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
-                startActivity(detailIntent);
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openDetailActivity(ChannelActivity.this, url, serviceId);
             }
         });
 
@@ -126,39 +130,79 @@ public class ChannelActivity extends AppCompatActivity {
             }
         });
 
+        subS = getString(R.string.subscriber);
+
+        progressBar = (ProgressBar) findViewById(R.id.progressBar);
+        channelBanner = (ImageView) header.findViewById(R.id.channel_banner_image);
+        avatarView = (ImageView) header.findViewById(R.id.channel_avatar_view);
+        titleView = (TextView) header.findViewById(R.id.channel_title_view);
+        subscirberView = (TextView) header.findViewById(R.id.channel_subscriber_view);
+        subscriberButton = (Button) header.findViewById(R.id.channel_subscribe_button);
+        subscriberLayout = header.findViewById(R.id.channel_subscriber_layout);
+
+        if(savedInstanceState == null) {
+            handleIntent(getIntent());
+        } else {
+            channelUrl = savedInstanceState.getString(NavStack.URL);
+            serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
+        }
+
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    private void handleIntent(Intent i) {
+        channelUrl = i.getStringExtra(NavStack.URL);
+        serviceId = i.getIntExtra(NavStack.SERVICE_ID, -1);
         requestData(false);
     }
 
-
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(NavStack.URL, channelUrl);
+        outState.putInt(NavStack.SERVICE_ID, serviceId);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
+    }
 
     private void updateUi(final ChannelInfo info) {
-        CollapsingToolbarLayout ctl = (CollapsingToolbarLayout) findViewById(R.id.channel_toolbar_layout);
-        ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
-        ImageView channelBanner = (ImageView) findViewById(R.id.channel_banner_image);
-        final FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
-        ImageView avatarView = (ImageView) findViewById(R.id.channel_avatar_view);
-        ImageView haloView = (ImageView) findViewById(R.id.channel_avatar_halo);
-
+        findViewById(R.id.channel_header_layout).setVisibility(View.VISIBLE);
         progressBar.setVisibility(View.GONE);
 
         if(info.channel_name != null && !info.channel_name.isEmpty()) {
-            ctl.setTitle(info.channel_name);
+            getSupportActionBar().setTitle(info.channel_name);
+            titleView.setText(info.channel_name);
         }
 
         if(info.banner_url != null && !info.banner_url.isEmpty()) {
             imageLoader.displayImage(info.banner_url, channelBanner,
-                    new ImageErrorLoadingListener(this, rootView ,info.service_id));
+                   new ImageErrorLoadingListener(this, rootView ,info.service_id));
         }
 
         if(info.avatar_url != null && !info.avatar_url.isEmpty()) {
             avatarView.setVisibility(View.VISIBLE);
-            haloView.setVisibility(View.VISIBLE);
             imageLoader.displayImage(info.avatar_url, avatarView,
                     new ImageErrorLoadingListener(this, rootView ,info.service_id));
         }
 
+        if(info.subscriberCount != -1) {
+            subscirberView.setText(buildSubscriberString(info.subscriberCount));
+        }
+
+        if((info.feed_url != null && !info.feed_url.isEmpty()) ||
+                (info.subscriberCount != -1)) {
+            subscriberLayout.setVisibility(View.VISIBLE);
+        }
+
         if(info.feed_url != null && !info.feed_url.isEmpty()) {
-            feedButton.setOnClickListener(new View.OnClickListener() {
+            subscriberButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     Log.d(TAG, info.feed_url);
@@ -167,12 +211,13 @@ public class ChannelActivity extends AppCompatActivity {
                 }
             });
         } else {
-            feedButton.setVisibility(View.GONE);
+            subscriberButton.setVisibility(View.INVISIBLE);
         }
+
     }
 
     private void addVideos(final ChannelInfo info) {
-        infoListAdapter.addStreamItemList(info.related_streams);
+        infoListAdapter.addInfoItemList(info.related_streams);
     }
 
     private void postNewErrorToast(Handler h, final int stringResource) {
@@ -188,6 +233,22 @@ public class ChannelActivity extends AppCompatActivity {
     private void requestData(final boolean onlyVideos) {
         // start processing
         isLoading = true;
+
+        if(!onlyVideos) {
+            //delete already displayed content
+            progressBar.setVisibility(View.VISIBLE);
+            infoListAdapter.clearSteamItemList();
+            pageNumber = 0;
+            subscriberLayout.setVisibility(View.GONE);
+            titleView.setText("");
+            getSupportActionBar().setTitle("");
+            if (SDK_INT >= 21) {
+                channelBanner.setImageDrawable(getDrawable(R.drawable.channel_banner));
+                avatarView.setImageDrawable(getDrawable(R.drawable.buddy));
+            }
+            infoListAdapter.showFooter(false);
+        }
+
         Thread channelExtractorThread = new Thread(new Runnable() {
             Handler h = new Handler();
 
@@ -208,8 +269,12 @@ public class ChannelActivity extends AppCompatActivity {
                             isLoading = false;
                             if(!onlyVideos) {
                                 updateUi(info);
+                                infoListAdapter.showFooter(true);
                             }
                             hasNextPage = info.hasNextPage;
+                            if(!hasNextPage) {
+                                infoListAdapter.showFooter(false);
+                            }
                             addVideos(info);
                         }
                     });
@@ -244,9 +309,13 @@ public class ChannelActivity extends AppCompatActivity {
                     });
                     pe.printStackTrace();
                 } catch(ExtractionException ex) {
+                    String name = "none";
+                    if(service != null) {
+                        name = service.getServiceInfo().name;
+                    }
                     ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
-                                    service.getServiceInfo().name, channelUrl, R.string.parsing_error));
+                                    name, channelUrl, R.string.parsing_error));
                     h.post(new Runnable() {
                         @Override
                         public void run() {
@@ -272,4 +341,64 @@ public class ChannelActivity extends AppCompatActivity {
         channelExtractorThread.start();
     }
 
+    @Override
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.menu_channel, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        super.onOptionsItemSelected(item);
+        switch(item.getItemId()) {
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            case R.id.menu_item_openInBrowser: {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(channelUrl));
+
+                startActivity(Intent.createChooser(intent, getString(R.string.choose_browser)));
+            }
+            case R.id.menu_item_share:
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, channelUrl);
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+            case android.R.id.home:
+                NavStack.getInstance().openMainActivity(this);
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private String buildSubscriberString(long count) {
+        String out = "";
+        if(count >= 1000000000){
+            out += Long.toString((count/1000000000)%1000)+".";
+        }
+        if(count>=1000000){
+            out += Long.toString((count/1000000)%1000) + ".";
+        }
+        if(count>=1000){
+            out += Long.toString((count/1000)%1000)+".";
+        }
+        out += Long.toString(count%1000) + " " + subS;
+        return out;
+    }
 }

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

@@ -2,15 +2,17 @@ package org.schabi.newpipe;
 
 import android.content.Intent;
 import android.media.AudioManager;
+import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
-import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-
+import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ThemeHelper;
 
 /**
  * Created by Christian Schabesberger on 02.08.16.
@@ -32,13 +34,15 @@ import org.schabi.newpipe.util.PermissionHelper;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class MainActivity extends ThemableActivity {
 
+public class MainActivity extends AppCompatActivity {
     private Fragment mainFragment = null;
+    private static final String TAG = MainActivity.class.toString();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_main);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         mainFragment = getSupportFragmentManager()
@@ -49,7 +53,6 @@ public class MainActivity extends ThemableActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
-
         inflater.inflate(R.menu.main_menu, menu);
         return true;
     }
@@ -58,7 +61,7 @@ public class MainActivity extends ThemableActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch(id) {
+        switch (id) {
             case android.R.id.home: {
                 Intent intent = new Intent(this, MainActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -71,10 +74,10 @@ public class MainActivity extends ThemableActivity {
                 return true;
             }
             case R.id.action_show_downloads: {
-                if(!PermissionHelper.checkStoragePermissions(this)) {
+                if (!PermissionHelper.checkStoragePermissions(this)) {
                     return false;
                 }
-                Intent intent = new Intent(this, org.schabi.newpipe.download.DownloadActivity.class);
+                Intent intent = new Intent(this, DownloadActivity.class);
                 startActivity(intent);
                 return true;
             }
@@ -82,4 +85,9 @@ public class MainActivity extends ThemableActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        //ignore back
+    }
 }

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

@@ -0,0 +1,158 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.util.NavStack;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
+ * RouterActivity .java is part of NewPipe.
+ *
+ * OpenHitboxStreams is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * OpenHitboxStreams is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenHitboxStreams.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * This Acitivty is designed to route share/open intents to the specified service, and
+ * to the part of the service which can handle the url.
+ */
+public class RouterActivity extends Activity {
+    private static final String TAG = RouterActivity.class.toString();
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+        finish();
+    }
+
+
+    private static String removeHeadingGibberish(final String input) {
+        int start = 0;
+        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
+            if (!input.substring(i, i + 1).matches("\\p{L}")) {
+                start = i + 1;
+                break;
+            }
+        }
+        return input.substring(start, input.length());
+    }
+
+    private static String trim(final String input) {
+        if (input == null || input.length() < 1) {
+            return input;
+        } else {
+            String output = input;
+            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(1);
+            }
+            while (output.length() > 0
+                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(0, output.length() - 1);
+            }
+            return output;
+        }
+    }
+
+    /**
+     * Retrieves all Strings which look remotely like URLs from a text.
+     * Used if NewPipe was called through share menu.
+     *
+     * @param sharedText text to scan for URLs.
+     * @return potential URLs
+     */
+    private String[] getUris(final String sharedText) {
+        final Collection<String> result = new HashSet<>();
+        if (sharedText != null) {
+            final String[] array = sharedText.split("\\p{Space}");
+            for (String s : array) {
+                s = trim(s);
+                if (s.length() != 0) {
+                    if (s.matches(".+://.+")) {
+                        result.add(removeHeadingGibberish(s));
+                    } else if (s.matches(".+\\..+")) {
+                        result.add("http://" + s);
+                    }
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    private void handleIntent(Intent intent) {
+        String videoUrl = "";
+        StreamingService service = null;
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        service = NewPipe.getServiceByUrl(videoUrl);
+        if(service == null) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                    .show();
+            return;
+        } else {
+            Intent callIntent = new Intent();
+            switch(service.getLinkTypeByUrl(videoUrl)) {
+                case CHANNEL:
+                    callIntent.setClass(this, ChannelActivity.class);
+                    break;
+                case STREAM:
+                    callIntent.setClass(this, VideoItemDetailActivity.class);
+                    callIntent.putExtra(VideoItemDetailFragment.AUTO_PLAY,
+                            PreferenceManager.getDefaultSharedPreferences(this)
+                                    .getBoolean(
+                                            getString(R.string.autoplay_through_intent_key), false));
+                    break;
+                case PLAYLIST:
+                    Log.e(TAG, "NOT YET DEFINED");
+                    break;
+                default:
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                            .show();
+                    return;
+            }
+
+            callIntent.putExtra(NavStack.URL, videoUrl);
+            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
+            startActivity(callIntent);
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 package org.schabi.newpipe;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
@@ -16,4 +15,14 @@ public class ThemableActivity extends AppCompatActivity {
                 setTheme(R.style.DarkTheme);
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", getResources().getString(R.string.light_theme_title)).
+                        equals(getResources().getString(R.string.dark_theme_title)))  {
+            setTheme(R.style.DarkTheme);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java

@@ -3,22 +3,15 @@ package org.schabi.newpipe.detail;
 import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Toast;
 
 import org.schabi.newpipe.App;
-import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.ThemableActivity;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-
-import java.util.Collection;
-import java.util.HashSet;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.ThemeHelper;
 
 
 /**
@@ -39,15 +32,7 @@ import java.util.HashSet;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class VideoItemDetailActivity extends ThemableActivity {
-
-    /**
-     * Removes invisible separators (\p{Z}) and punctuation characters including
-     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
-     * more details.
-     */
-    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
-
+public class VideoItemDetailActivity extends AppCompatActivity {
     private static final String TAG = VideoItemDetailActivity.class.toString();
 
     private VideoItemDetailFragment fragment;
@@ -57,6 +42,7 @@ public class VideoItemDetailActivity extends ThemableActivity {
 
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_videoitem_detail);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         // Show the Up button in the action bar.
@@ -81,8 +67,10 @@ public class VideoItemDetailActivity extends ThemableActivity {
         if (savedInstanceState == null) {
             handleIntent(getIntent());
         } else {
-            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
-            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
+            videoUrl = savedInstanceState.getString(NavStack.URL);
+            currentStreamingService = savedInstanceState.getInt(NavStack.SERVICE_ID);
+            NavStack.getInstance()
+                    .restoreSavedInstanceState(savedInstanceState);
             addFragment(savedInstanceState);
         }
     }
@@ -97,29 +85,15 @@ public class VideoItemDetailActivity extends ThemableActivity {
     private void handleIntent(Intent intent) {
         Bundle arguments = new Bundle();
         boolean autoplay = false;
-        if (intent.getData() != null) {
-            // this means the video was called though another app
-            videoUrl = intent.getData().toString();
-            currentStreamingService = getServiceIdByUrl(videoUrl);
-            if(currentStreamingService == -1) {
-                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
-                        .show();
-            }
-            autoplay = PreferenceManager.getDefaultSharedPreferences(this)
-                            .getBoolean(getString(R.string.autoplay_through_intent_key), false);
-        } else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
-            //this means that vidoe was called through share menu
-            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
-            videoUrl = getUris(extraText)[0];
-            currentStreamingService = getServiceIdByUrl(videoUrl);
-        } else {
-            //this is if the video was called through another NewPipe activity
-            videoUrl = intent.getStringExtra(VideoItemDetailFragment.VIDEO_URL);
-            currentStreamingService = intent.getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
+
+        videoUrl = intent.getStringExtra(NavStack.URL);
+        currentStreamingService = intent.getIntExtra(NavStack.SERVICE_ID, -1);
+        if(intent.hasExtra(VideoItemDetailFragment.AUTO_PLAY)) {
+            arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
+                    intent.getBooleanExtra(VideoItemDetailFragment.AUTO_PLAY, false));
         }
-        arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, autoplay);
-        arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        arguments.putString(NavStack.URL, videoUrl);
+        arguments.putInt(NavStack.SERVICE_ID, currentStreamingService);
         addFragment(arguments);
     }
 
@@ -142,9 +116,11 @@ public class VideoItemDetailActivity extends ThemableActivity {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
-        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        outState.putString(NavStack.URL, videoUrl);
+        outState.putInt(NavStack.SERVICE_ID, currentStreamingService);
         outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
+        NavStack.getInstance()
+                .onSaveInstanceState(outState);
     }
 
     @Override
@@ -159,77 +135,21 @@ public class VideoItemDetailActivity extends ThemableActivity {
 
             // http://developer.android.com/design/patterns/navigation.html#up-vs-back
 
-            Intent intent = new Intent(this, MainActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            NavUtils.navigateUpTo(this, intent);
+            NavStack.getInstance()
+                    .openMainActivity(this);
             return true;
         } else {
             return super.onOptionsItemSelected(item);
         }
     }
 
-    /**
-     * Retrieves all Strings which look remotely like URLs from a text.
-     * Used if NewPipe was called through share menu.
-     *
-     * @param sharedText text to scan for URLs.
-     * @return potential URLs
-     */
-    private String[] getUris(final String sharedText) {
-        final Collection<String> result = new HashSet<>();
-        if (sharedText != null) {
-            final String[] array = sharedText.split("\\p{Space}");
-            for (String s : array) {
-                s = trim(s);
-                if (s.length() != 0) {
-                    if (s.matches(".+://.+")) {
-                        result.add(removeHeadingGibberish(s));
-                    } else if (s.matches(".+\\..+")) {
-                        result.add("http://" + s);
-                    }
-                }
-            }
+    @Override
+    public void onBackPressed() {
+        try {
+            NavStack.getInstance()
+                    .navBack(this);
+        } catch (Exception e) {
+            ErrorActivity.reportUiError(this, e);
         }
-        return result.toArray(new String[result.size()]);
-    }
-
-    private static String removeHeadingGibberish(final String input) {
-        int start = 0;
-        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
-            if (!input.substring(i, i + 1).matches("\\p{L}")) {
-                start = i + 1;
-                break;
-            }
-        }
-        return input.substring(start, input.length());
-    }
-
-    private static String trim(final String input) {
-        if (input == null || input.length() < 1) {
-            return input;
-        } else {
-            String output = input;
-            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
-                output = output.substring(1);
-            }
-            while (output.length() > 0
-                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
-                output = output.substring(0, output.length() - 1);
-            }
-            return output;
-        }
-    }
-
-    private int getServiceIdByUrl(String url) {
-        StreamingService[] serviceList = NewPipe.getServices();
-        int service = -1;
-        for (int i = 0; i < serviceList.length; i++) {
-            if (serviceList[i].getUrlIdHandlerInstance().acceptUrl(videoUrl)) {
-                service = i;
-                //videoExtractor = ServiceList.getService(i).getExtractorInstance();
-                break;
-            }
-        }
-        return service;
     }
 }

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java

@@ -33,6 +33,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+
 import com.google.android.exoplayer.util.Util;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -40,17 +41,16 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
 import org.schabi.newpipe.ActivityCommunicator;
-import org.schabi.newpipe.ChannelActivity;
 import org.schabi.newpipe.ImageErrorLoadingListener;
 import org.schabi.newpipe.Localization;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream_info.AudioStream;
 import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.player.BackgroundPlayer;
@@ -58,6 +58,8 @@ import org.schabi.newpipe.player.ExoPlayerActivity;
 import org.schabi.newpipe.player.PlayVideoActivity;
 import org.schabi.newpipe.report.ErrorActivity;
 import java.util.Vector;
+
+import org.schabi.newpipe.util.NavStack;
 import org.schabi.newpipe.util.PermissionHelper;
 
 import static android.app.Activity.RESULT_OK;
@@ -91,8 +93,6 @@ public class VideoItemDetailFragment extends Fragment {
      * The fragment argument representing the item ID that this fragment
      * represents.
      */
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAMING_SERVICE = "streaming_service";
     public static final String AUTO_PLAY = "auto_play";
 
     private AppCompatActivity activity;
@@ -288,10 +288,8 @@ public class VideoItemDetailFragment extends Fragment {
                 channelButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        Intent i = new Intent(activity, ChannelActivity.class);
-                        i.putExtra(ChannelActivity.CHANNEL_URL, info.channel_url);
-                        i.putExtra(ChannelActivity.SERVICE_ID, info.service_id);
-                        startActivity(i);
+                        NavStack.getInstance()
+                                .openChannelActivity(getActivity(), info.channel_url, info.service_id);
                     }
                 });
             } else {
@@ -536,13 +534,15 @@ public class VideoItemDetailFragment extends Fragment {
 
     private void initSimilarVideos(final StreamInfo info) {
         LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similar_streams_view);
-        for (final StreamPreviewInfo item : info.related_streams) {
+        for (final InfoItem item : info.related_streams) {
             similarLayout.addView(infoItemBuilder.buildView(similarLayout, item));
         }
-        infoItemBuilder.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
             @Override
-            public void selected(String url) {
-                openStreamUrl(url);
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openDetailActivity(getContext(), url, serviceId);
             }
         });
     }
@@ -677,8 +677,8 @@ public class VideoItemDetailFragment extends Fragment {
         // then we must not try to access objects of this fragment.
         // Otherwise the applications would crash.
         if(backgroundButton != null) {
-            streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
-            String videoUrl = getArguments().getString(VIDEO_URL);
+            streamingServiceId = getArguments().getInt(NavStack.SERVICE_ID);
+            String videoUrl = getArguments().getString(NavStack.URL);
             StreamInfoWorker siw = StreamInfoWorker.getInstance();
             siw.search(streamingServiceId, videoUrl, getActivity());
 
@@ -798,8 +798,11 @@ public class VideoItemDetailFragment extends Fragment {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        super.onOptionsItemSelected(item);
-        return actionBarHandler.onItemSelected(item);
+        if(!actionBarHandler.onItemSelected(item)) {
+            return super.onOptionsItemSelected(item);
+        } else {
+            return true;
+        }
     }
 
     public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
@@ -811,21 +814,13 @@ public class VideoItemDetailFragment extends Fragment {
                 stringResource, Toast.LENGTH_LONG).show();
     }
 
-    private void openStreamUrl(String url) {
-        Intent detailIntent = new Intent(activity, VideoItemDetailActivity.class);
-        detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
-        detailIntent.putExtra(
-                VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-        activity.startActivity(detailIntent);
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         switch (requestCode) {
             case RECAPTCHA_REQUEST:
                 if (resultCode == RESULT_OK) {
-                    String videoUrl = getArguments().getString(VIDEO_URL);
+                    String videoUrl = getArguments().getString(NavStack.URL);
                     StreamInfoWorker siw = StreamInfoWorker.getInstance();
                     siw.search(streamingServiceId, videoUrl, getActivity());
                 } else {

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

@@ -3,18 +3,15 @@ package org.schabi.newpipe.download;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -28,32 +25,28 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.ThemableActivity;
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.File;
 import java.util.Vector;
 
-import us.shandian.giga.get.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 import us.shandian.giga.util.CrashHandler;
 import us.shandian.giga.util.Utility;
 
-public class DownloadActivity extends ThemableActivity implements AdapterView.OnItemClickListener{
+public class DownloadActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
 
     public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
 
     public static final String INTENT_LIST = "us.shandian.giga.intent.LIST";
-
-    private static final String TAG = DownloadActivity.class.toString();
     public static final String THREADS = "threads";
-
-
+    private static final String TAG = DownloadActivity.class.toString();
     private MissionsFragment mFragment;
 
 
@@ -72,9 +65,9 @@ public class DownloadActivity extends ThemableActivity implements AdapterView.On
         startService(i);
 
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_downloader);
 
-
         //noinspection ConstantConditions
 
         // its ok if this fails, we will catch that error later, and send it as report
@@ -242,9 +235,7 @@ public class DownloadActivity extends ThemableActivity implements AdapterView.On
 
         switch (id) {
             case android.R.id.home: {
-                Intent intent = new Intent(this, org.schabi.newpipe.MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                NavUtils.navigateUpTo(this, intent);
+                onBackPressed();
                 return true;
             }
             case R.id.action_settings: {
@@ -252,14 +243,6 @@ public class DownloadActivity extends ThemableActivity implements AdapterView.On
                 startActivity(intent);
                 return true;
             }
-            case R.id.action_report_error: {
-                ErrorActivity.reportError(DownloadActivity.this, new Vector<Throwable>(),
-                        null, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.USER_REPORT,
-                                null,
-                                "user_report", R.string.user_report));
-                return true;
-            }
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/org/schabi/newpipe/extractor/AbstractStreamInfo.java

@@ -1,41 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-/**
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * AbstractStreamInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Common properties between StreamInfo and StreamPreviewInfo.*/
-public abstract class AbstractStreamInfo {
-    public static enum StreamType {
-        NONE,   // placeholder to check if stream type was checked or not
-        VIDEO_STREAM,
-        AUDIO_STREAM,
-        LIVE_STREAM,
-        AUDIO_LIVE_STREAM,
-        FILE
-    }
-
-    public StreamType stream_type;
-    public int service_id = -1;
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    public String thumbnail_url = "";
-    public String webpage_url = "";
-    public String upload_date = "";
-    public long view_count = -1;
-}

app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java

@@ -1,113 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import android.util.Xml;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.stream_info.AudioStream;
-import org.xmlpull.v1.XmlPullParser;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 02.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * DashMpdParser.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class DashMpdParser {
-
-    private DashMpdParser() {
-    }
-
-    static class DashMpdParsingException extends ParsingException {
-        DashMpdParsingException(String message, Exception e) {
-            super(message, e);
-        }
-    }
-
-    public static List<AudioStream> getAudioStreams(String dashManifestUrl)
-            throws DashMpdParsingException, ReCaptchaException {
-        String dashDoc;
-        Downloader downloader = NewPipe.getDownloader();
-        try {
-            dashDoc = downloader.download(dashManifestUrl);
-        } catch(IOException ioe) {
-            throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
-        } catch (ReCaptchaException e) {
-            throw new ReCaptchaException("reCaptcha Challenge needed");
-        }
-        Vector<AudioStream> audioStreams = new Vector<>();
-        try {
-            XmlPullParser parser = Xml.newPullParser();
-            parser.setInput(new StringReader(dashDoc));
-            String tagName = "";
-            String currentMimeType = "";
-            int currentBandwidth = -1;
-            int currentSamplingRate = -1;
-            boolean currentTagIsBaseUrl = false;
-            for(int eventType = parser.getEventType();
-                eventType != XmlPullParser.END_DOCUMENT;
-                eventType = parser.next() ) {
-                switch(eventType) {
-                    case XmlPullParser.START_TAG:
-                        tagName = parser.getName();
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
-                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
-                            currentBandwidth = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
-                            currentSamplingRate = Integer.parseInt(
-                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = true;
-                        }
-                        break;
-
-                    case XmlPullParser.TEXT:
-                        // actual stream tag
-                        if(currentTagIsBaseUrl &&
-                                (currentMimeType.contains("audio"))) {
-                            int format = -1;
-                            if(currentMimeType.equals(MediaFormat.WEBMA.mimeType)) {
-                                format = MediaFormat.WEBMA.id;
-                            } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
-                                format = MediaFormat.M4A.id;
-                            }
-                            audioStreams.add(new AudioStream(parser.getText(),
-                                    format, currentBandwidth, currentSamplingRate));
-                        }
-                        break;
-
-                    case XmlPullParser.END_TAG:
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = "";
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = false;
-                        }
-                        break;
-                }
-            }
-        } catch(Exception e) {
-            throw new DashMpdParsingException("Could not parse Dash mpd", e);
-        }
-        return audioStreams;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/Downloader.java

@@ -1,52 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * Created by Christian Schabesberger on 28.01.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * Downloader.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public interface Downloader {
-
-    /**Download the text file at the supplied URL as in download(String),
-     * but set the HTTP header field "Accept-Language" to the supplied string.
-     * @param siteUrl the URL of the text file to return the contents of
-     * @param language the language (usually a 2-character code) to set as the preferred language
-     * @return the contents of the specified text file
-     * @throws IOException*/
-    String download(String siteUrl, String language) throws IOException, ReCaptchaException;
-
-    /**Download the text file at the supplied URL as in download(String),
-     * but set the HTTP header field "Accept-Language" to the supplied string.
-     * @param siteUrl the URL of the text file to return the contents of
-     * @param customProperties set request header properties
-     * @return the contents of the specified text file
-     * @throws IOException*/
-    String download(String siteUrl, Map<String, String> customProperties) throws IOException, ReCaptchaException;
-
-    /**Download (via HTTP) the text file located at the supplied URL, and return its contents.
-     * Primarily intended for downloading web pages.
-     * @param siteUrl the URL of the text file to download
-     * @return the contents of the specified text file
-     * @throws IOException*/
-    String download(String siteUrl) throws IOException, ReCaptchaException;
-}

app/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java

@@ -1,83 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-/**
- * Created by Adam Howard on 08/11/15.
- *
- * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
- *     and Adam Howard <achdisposable1@gmail.com> 2015
- *
- * MediaFormat.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Static data about various media formats support by Newpipe, eg mime type, extension*/
-
-public enum MediaFormat {
-    //video and audio combined formats
-    //           id      name    suffix  mime type
-    MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
-    v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
-    WEBM        (0x2,   "WebM",  "webm", "video/webm"),
-    // audio formats
-    M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
-    WEBMA       (0x4,   "WebM",  "webm", "audio/webm");
-
-    public final int id;
-    @SuppressWarnings("WeakerAccess")
-    public final String name;
-    @SuppressWarnings("WeakerAccess")
-    public final String suffix;
-    public final String mimeType;
-
-    MediaFormat(int id, String name, String suffix, String mimeType) {
-        this.id = id;
-        this.name = name;
-        this.suffix = suffix;
-        this.mimeType = mimeType;
-    }
-
-    /**Return the friendly name of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the friendly name of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getNameById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.name;
-        }
-        return "";
-    }
-
-    /**Return the file extension of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the file extension of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getSuffixById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.suffix;
-        }
-        return "";
-    }
-
-    /**Return the MIME type of the media format with the supplied id
-     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
-     * @return the MIME type of the MediaFormat associated with this ids,
-     * or an empty String if none match it.*/
-    public static String getMimeById(int ident) {
-        for (MediaFormat vf : MediaFormat.values()) {
-            if(vf.id == ident) return vf.mimeType;
-        }
-        return "";
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/NewPipe.java

@@ -1,82 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
-
-/**
- * Created by Christian Schabesberger on 23.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * NewPipe.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Provides access to the video streaming services supported by NewPipe.
- * Currently only Youtube until the API becomes more stable.*/
-
-@SuppressWarnings("ALL")
-public class NewPipe {
-
-    private NewPipe() {
-    }
-
-    private static final String TAG = NewPipe.class.toString();
-
-    private static final StreamingService[] serviceList = {
-        new YoutubeService(0)
-    };
-
-    private static Downloader downloader = null;
-
-    public static StreamingService[] getServices() {
-        return serviceList;
-    }
-    public static StreamingService getService(int serviceId)throws ExtractionException {
-        for(StreamingService s : serviceList) {
-            if(s.getServiceId() == serviceId) {
-                return s;
-            }
-        }
-        throw new ExtractionException("Service not known: " + Integer.toString(serviceId));
-    }
-    public static StreamingService getService(String serviceName) throws ExtractionException {
-        return serviceList[getIdOfService(serviceName)];
-    }
-    public static String getNameOfService(int id) {
-        try {
-            return getService(id).getServiceInfo().name;
-        } catch (Exception e) {
-            System.err.println("Service id not known");
-            e.printStackTrace();
-            return "";
-        }
-    }
-    public static int getIdOfService(String serviceName) throws ExtractionException {
-        for(int i = 0; i < serviceList.length; i++) {
-            if(serviceList[i].getServiceInfo().name.equals(serviceName)) {
-                return i;
-            }
-        }
-        throw new ExtractionException("Error: Service " + serviceName + " not known.");
-    }
-
-    public static void init(Downloader d) {
-        downloader = d;
-    }
-
-    public static Downloader getDownloader() {
-        return downloader;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/Parser.java

@@ -1,77 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by Christian Schabesberger on 02.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * Parser.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** avoid using regex !!! */
-public class Parser {
-
-    private Parser() {
-    }
-
-    public static class RegexException extends ParsingException {
-        public RegexException(String message) {
-            super(message);
-        }
-    }
-
-    public static String matchGroup1(String pattern, String input) throws RegexException {
-        return matchGroup(pattern, input, 1);
-    }
-
-    public static String matchGroup(String pattern, String input, int group) throws RegexException {
-        Pattern pat = Pattern.compile(pattern);
-        Matcher mat = pat.matcher(input);
-        boolean foundMatch = mat.find();
-        if (foundMatch) {
-            return mat.group(group);
-        }
-        else {
-            //Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
-            if(input.length() > 1024) {
-                throw new RegexException("failed to find pattern \""+pattern);
-            } else {
-                throw new RegexException("failed to find pattern \"" + pattern + " inside of " + input + "\"");
-            }
-        }
-    }
-
-    public static Map<String, String> compatParseMap(final String input) throws UnsupportedEncodingException {
-        Map<String, String> map = new HashMap<>();
-        for(String arg : input.split("&")) {
-            String[] splitArg = arg.split("=");
-            if(splitArg.length > 1) {
-                map.put(splitArg[0], URLDecoder.decode(splitArg[1], "UTF-8"));
-            } else {
-                map.put(splitArg[0], "");
-            }
-        }
-        return map;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

@@ -1,56 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SuggestionExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 23.08.15.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamingService.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class StreamingService {
-    public class ServiceInfo {
-        public String name = "";
-    }
-
-    private int serviceId;
-
-    public StreamingService(int id) {
-        serviceId = id;
-    }
-
-    public abstract ServiceInfo getServiceInfo();
-
-    public abstract StreamExtractor getExtractorInstance(String url)
-            throws IOException, ExtractionException;
-    public abstract SearchEngine getSearchEngineInstance();
-    public abstract UrlIdHandler getUrlIdHandlerInstance();
-    public abstract UrlIdHandler getChannelUrlIdHandlerInstance();
-    public abstract ChannelExtractor getChannelExtractorInstance(String url, int page)
-            throws ExtractionException, IOException;
-    public abstract SuggestionExtractor getSuggestionExtractorInstance();
-
-    public final int getServiceId() {
-        return serviceId;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java

@@ -1,34 +0,0 @@
-package org.schabi.newpipe.extractor;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-/**
- * Created by Christian Schabesberger on 26.07.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * UrlIdHandler.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public interface UrlIdHandler {
-    String getUrl(String videoId);
-    String getId(String siteUrl) throws ParsingException;
-    String cleanUrl(String siteUrl) throws ParsingException;
-
-    /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
-     Intent was meant to be watched with this Service.
-     Return false if this service shall not allow to be called through ACTIONs.*/
-    boolean acceptUrl(String videoUrl);
-}

app/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java

@@ -1,61 +0,0 @@
-package org.schabi.newpipe.extractor.channel;
-
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 25.07.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ChannelExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class ChannelExtractor {
-    private int serviceId;
-    private String url;
-    private UrlIdHandler urlIdHandler;
-    private StreamPreviewInfoCollector previewInfoCollector;
-    private int page = -1;
-
-    public ChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
-            throws ExtractionException, IOException {
-        this.url = url;
-        this.page = page;
-        this.serviceId = serviceId;
-        this.urlIdHandler = urlIdHandler;
-        previewInfoCollector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
-    }
-
-    public String getUrl() { return url; }
-    public UrlIdHandler getUrlIdHandler() { return urlIdHandler; }
-    public StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
-        return previewInfoCollector;
-    }
-
-    public abstract String getChannelName() throws ParsingException;
-    public abstract String getAvatarUrl() throws ParsingException;
-    public abstract String getBannerUrl() throws ParsingException;
-    public abstract String getFeedUrl() throws ParsingException;
-    public abstract StreamPreviewInfoCollector getStreams() throws ParsingException;
-    public abstract boolean hasNextPage() throws ParsingException;
-    public int getServiceId() {
-        return serviceId;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java

@@ -1,81 +0,0 @@
-package org.schabi.newpipe.extractor.channel;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
-
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 31.07.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ChannelInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class ChannelInfo {
-
-
-    public void addException(Exception e) {
-        errors.add(e);
-    }
-
-    public static ChannelInfo getInfo(ChannelExtractor extractor)
-        throws ParsingException {
-        ChannelInfo info = new ChannelInfo();
-
-        // importand data
-        info.service_id = extractor.getServiceId();
-        info.channel_name = extractor.getChannelName();
-        info.hasNextPage = extractor.hasNextPage();
-
-        try {
-            info.avatar_url = extractor.getAvatarUrl();
-        } catch (Exception e) {
-            info.errors.add(e);
-        }
-        try {
-            info.banner_url = extractor.getBannerUrl();
-        } catch (Exception e) {
-            info.errors.add(e);
-        }
-        try {
-            info.feed_url = extractor.getFeedUrl();
-        } catch(Exception e) {
-            info.errors.add(e);
-        }
-        try {
-            StreamPreviewInfoCollector c = extractor.getStreams();
-            info.related_streams = c.getItemList();
-            info.errors.addAll(c.getErrors());
-        } catch(Exception e) {
-            info.errors.add(e);
-        }
-
-        return info;
-    }
-
-    public int service_id = -1;
-    public String channel_name = "";
-    public String avatar_url = "";
-    public String banner_url = "";
-    public String feed_url = "";
-    public List<StreamPreviewInfo> related_streams = null;
-    public boolean hasNextPage = false;
-
-    public List<Throwable> errors = new Vector<>();
-}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java

@@ -1,33 +0,0 @@
-package org.schabi.newpipe.extractor.exceptions;
-
-/**
- * Created by Christian Schabesberger on 30.01.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ExtractionException.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class ExtractionException extends Exception {
-    public ExtractionException(String message) {
-        super(message);
-    }
-    public ExtractionException(Throwable cause) {
-        super(cause);
-    }
-    public ExtractionException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java

@@ -1,30 +0,0 @@
-package org.schabi.newpipe.extractor.exceptions;
-
-/**
- * Created by Christian Schabesberger on 12.09.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * FoundAdException.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class FoundAdException extends ParsingException {
-    public FoundAdException(String message) {
-        super(message);
-    }
-    public FoundAdException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java

@@ -1,31 +0,0 @@
-package org.schabi.newpipe.extractor.exceptions;
-
-/**
- * Created by Christian Schabesberger on 31.01.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ParsingException.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-public class ParsingException extends ExtractionException {
-    public ParsingException(String message) {
-        super(message);
-    }
-    public ParsingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java

@@ -1,27 +0,0 @@
-package org.schabi.newpipe.extractor.exceptions;
-
-/**
- * Created by beneth <bmauduit@beneth.fr> on 07.12.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * ReCaptchaException.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class ReCaptchaException extends ExtractionException {
-    public ReCaptchaException(String message) {
-        super(message);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java

@@ -1,49 +0,0 @@
-package org.schabi.newpipe.extractor.search;
-
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * SearchEngine.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class SearchEngine {
-    public static class NothingFoundException extends ExtractionException {
-        public NothingFoundException(String message) {
-            super(message);
-        }
-    }
-
-    private StreamPreviewInfoSearchCollector collector;
-
-    public SearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
-        collector = new StreamPreviewInfoSearchCollector(urlIdHandler, serviceId);
-    }
-
-    protected StreamPreviewInfoSearchCollector getStreamPreviewInfoSearchCollector() {
-        return collector;
-    }
-
-    //Result search(String query, int page);
-    public abstract StreamPreviewInfoSearchCollector search(
-            String query, int page, String contentCountry)
-            throws ExtractionException, IOException;
-}

app/src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java

@@ -1,50 +0,0 @@
-package org.schabi.newpipe.extractor.search;
-
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 29.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * SearchResult.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class SearchResult {
-    public static SearchResult getSearchResult(SearchEngine engine, String query,
-                                               int page, String languageCode)
-            throws ExtractionException, IOException {
-
-        SearchResult result = engine.search(query, page, languageCode).getSearchResult();
-        if(result.resultList.isEmpty()) {
-            if(result.suggestion.isEmpty()) {
-                throw new ExtractionException("Empty result despite no error");
-            } else {
-                // This is used as a fallback. Do not relay on it !!!
-                throw new SearchEngine.NothingFoundException(result.suggestion);
-            }
-        }
-        return result;
-    }
-
-    public String suggestion = "";
-    public List<StreamPreviewInfo> resultList = new Vector<>();
-    public List<Throwable> errors = new Vector<>();
-}

app/src/main/java/org/schabi/newpipe/extractor/search/StreamPreviewInfoSearchCollector.java

@@ -1,45 +0,0 @@
-package org.schabi.newpipe.extractor.search;
-
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
-
-/**
- * Created by Christian Schabesberger on 11.05.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamPreviewInfoSearchCollector.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class StreamPreviewInfoSearchCollector extends StreamPreviewInfoCollector {
-
-    private String suggestion = "";
-
-    public StreamPreviewInfoSearchCollector(UrlIdHandler handler, int serviceId) {
-        super(handler, serviceId);
-    }
-
-    public void setSuggestion(String suggestion) {
-        this.suggestion = suggestion;
-    }
-
-    public SearchResult getSearchResult() {
-        SearchResult result = new SearchResult();
-        result.suggestion = suggestion;
-        result.errors = getErrors();
-        result.resultList = getItemList();
-        return result;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/search/SuggestionExtractor.java

@@ -1,43 +0,0 @@
-package org.schabi.newpipe.extractor.search;
-
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Created by Christian Schabesberger on 28.09.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * SuggestionExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public abstract class SuggestionExtractor {
-
-    private int serviceId;
-
-    public SuggestionExtractor(int serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public abstract List<String> suggestionList(
-            String query,String contentCountry)
-            throws ExtractionException, IOException;
-
-    public int getServiceId() {
-        return serviceId;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java

@@ -1,339 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
-
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 25.07.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeChannelExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeChannelExtractor extends ChannelExtractor {
-
-    private static final String TAG = YoutubeChannelExtractor.class.toString();
-
-    // private CSSOMParser cssParser = new CSSOMParser(new SACParserCSS3());
-
-    private Document doc = null;
-
-    private boolean isAjaxPage = false;
-    private static String userUrl = "";
-    private static String channelName = "";
-    private static String avatarUrl = "";
-    private static String bannerUrl = "";
-    private static String feedUrl = "";
-    // the fist page is html all other pages are ajax. Every new page can be requested by sending
-    // this request url.
-    private static String nextPageUrl = "";
-
-    public YoutubeChannelExtractor(UrlIdHandler urlIdHandler, String url, int page, int serviceId)
-            throws ExtractionException, IOException {
-        super(urlIdHandler, url, page, serviceId);
-
-        Downloader downloader = NewPipe.getDownloader();
-
-        url = urlIdHandler.cleanUrl(url) ; //+ "/video?veiw=0&flow=list&sort=dd";
-
-        if(page == 0) {
-            if (isUserUrl(url)) {
-                userUrl = url;
-            } else {
-                // we first need to get the user url. Otherwise we can't find videos
-                String channelPageContent = downloader.download(url);
-                Document channelDoc = Jsoup.parse(channelPageContent, url);
-                userUrl = getUserUrl(channelDoc);
-            }
-
-            userUrl = userUrl + "/videos?veiw=0&flow=list&sort=dd&live_view=10000";
-            String pageContent = downloader.download(userUrl);
-            doc = Jsoup.parse(pageContent, userUrl);
-            nextPageUrl = getNextPageUrl(doc);
-            isAjaxPage = false;
-        } else {
-            String ajaxDataRaw = downloader.download(nextPageUrl);
-            JSONObject ajaxData;
-            try {
-                ajaxData = new JSONObject(ajaxDataRaw);
-                String htmlDataRaw = ajaxData.getString("content_html");
-                doc = Jsoup.parse(htmlDataRaw, nextPageUrl);
-
-                String nextPageHtmlDataRaw = ajaxData.getString("load_more_widget_html");
-                if(!nextPageHtmlDataRaw.isEmpty()) {
-                    Document nextPageData = Jsoup.parse(nextPageHtmlDataRaw, nextPageUrl);
-                    nextPageUrl = getNextPageUrl(nextPageData);
-                } else {
-                    nextPageUrl = "";
-                }
-            } catch (JSONException e) {
-                throw new ParsingException("Could not parse json data for next page", e);
-            }
-            isAjaxPage = true;
-        }
-    }
-
-    @Override
-    public String getChannelName() throws ParsingException {
-        try {
-            if(!isAjaxPage) {
-                channelName = doc.select("span[class=\"qualified-channel-title-text\"]").first()
-                        .select("a").first().text();
-            }
-            return channelName;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get channel name");
-        }
-    }
-
-    @Override
-    public String getAvatarUrl() throws ParsingException {
-        try {
-            if(!isAjaxPage) {
-                avatarUrl = doc.select("img[class=\"channel-header-profile-image\"]")
-                        .first().attr("abs:src");
-            }
-            return avatarUrl;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get avatar", e);
-        }
-    }
-
-    @Override
-    public String getBannerUrl() throws ParsingException {
-        try {
-            if(!isAjaxPage) {
-                Element el = doc.select("div[id=\"gh-banner\"]").first().select("style").first();
-                String cssContent = el.html();
-                String url = "https:" + Parser.matchGroup1("url\\(([^)]+)\\)", cssContent);
-                if (url.contains("s.ytimg.com")) {
-                    bannerUrl = null;
-                } else {
-                    bannerUrl = url;
-                }
-            }
-            return bannerUrl;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get Banner", e);
-        }
-    }
-
-    @Override
-    public StreamPreviewInfoCollector getStreams() throws ParsingException {
-        StreamPreviewInfoCollector collector = getStreamPreviewInfoCollector();
-        Element ul = null;
-        if(isAjaxPage) {
-            ul = doc.select("body").first();
-        } else {
-            ul = doc.select("ul[id=\"browse-items-primary\"]").first();
-        }
-
-        for(final Element li : ul.children()) {
-            if (li.select("div[class=\"feed-item-dismissable\"]").first() != null) {
-                collector.commit(new StreamPreviewInfoExtractor() {
-                    @Override
-                    public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
-                        return AbstractStreamInfo.StreamType.VIDEO_STREAM;
-                    }
-
-                    @Override
-                    public String getWebPageUrl() throws ParsingException {
-                        try {
-                            Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
-                            Element dl = el.select("h3").first().select("a").first();
-                            return dl.attr("abs:href");
-                        } catch (Exception e) {
-                            throw new ParsingException("Could not get web page url for the video", e);
-                        }
-                    }
-
-                    @Override
-                    public String getTitle() throws ParsingException {
-                        try {
-                            Element el = li.select("div[class=\"feed-item-dismissable\"]").first();
-                            Element dl = el.select("h3").first().select("a").first();
-                            return dl.text();
-                        } catch (Exception e) {
-                            throw new ParsingException("Could not get title", e);
-                        }
-                    }
-
-                    @Override
-                    public int getDuration() throws ParsingException {
-                        try {
-                            return YoutubeParsingHelper.parseDurationString(
-                                    li.select("span[class=\"video-time\"]").first().text());
-                        } catch(Exception e) {
-                            if(isLiveStream(li)) {
-                                // -1 for no duration
-                                return -1;
-                            } else {
-                                throw new ParsingException("Could not get Duration: " + getTitle(), e);
-                            }
-                        }
-                    }
-
-                    @Override
-                    public String getUploader() throws ParsingException {
-                        return getChannelName();
-                    }
-
-                    @Override
-                    public String getUploadDate() throws ParsingException {
-                        try {
-                            return li.select("div[class=\"yt-lockup-meta\"]").first()
-                                    .select("li").first()
-                                    .text();
-                        } catch(Exception e) {
-                            throw new ParsingException("Could not get uplaod date", e);
-                        }
-                    }
-
-                    @Override
-                    public long getViewCount() throws ParsingException {
-                        String output;
-                        String input;
-                        try {
-                            input = li.select("div[class=\"yt-lockup-meta\"]").first()
-                                    .select("li").get(1)
-                                    .text();
-                        } catch (IndexOutOfBoundsException e) {
-                            if(isLiveStream(li)) {
-                                // -1 for no view count
-                                return -1;
-                            } else {
-                                throw new ParsingException(
-                                        "Could not parse yt-lockup-meta although available: " + getTitle(), e);
-                            }
-                        }
-
-                        output = Parser.matchGroup1("([0-9,\\. ]*)", input)
-                                .replace(" ", "")
-                                .replace(".", "")
-                                .replace(",", "");
-
-                        try {
-                            return Long.parseLong(output);
-                        } catch (NumberFormatException e) {
-                            // if this happens the video probably has no views
-                            if(!input.isEmpty()) {
-                                return 0;
-                            } else {
-                                throw new ParsingException("Could not handle input: " + input, e);
-                            }
-                        }
-                    }
-
-                    @Override
-                    public String getThumbnailUrl() throws ParsingException {
-                        try {
-                            String url;
-                            Element te = li.select("span[class=\"yt-thumb-clip\"]").first()
-                                    .select("img").first();
-                            url = te.attr("abs:src");
-                            // Sometimes youtube sends links to gif files which somehow seem to not exist
-                            // anymore. Items with such gif also offer a secondary image source. So we are going
-                            // to use that if we've caught such an item.
-                            if (url.contains(".gif")) {
-                                url = te.attr("abs:data-thumb");
-                            }
-                            return url;
-                        } catch (Exception e) {
-                            throw new ParsingException("Could not get thumbnail url", e);
-                        }
-                    }
-
-                    private boolean isLiveStream(Element item) {
-                        Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
-
-                        if(bla == null) {
-                            // sometimes livestreams dont have badges but sill are live streams
-                            // if video time is not available we most likly have an offline livestream
-                            if(item.select("span[class*=\"video-time\"]").first() == null) {
-                                return true;
-                            }
-                        }
-                        return bla != null;
-                    }
-                });
-            }
-        }
-
-        return collector;
-    }
-
-    @Override
-    public String getFeedUrl() throws ParsingException {
-        try {
-            if(userUrl.contains("channel")) {
-                //channels don't have feeds in youtube, only user can provide such
-                return "";
-            }
-            if(!isAjaxPage) {
-                feedUrl = doc.select("link[title=\"RSS\"]").first().attr("abs:href");
-            }
-            return feedUrl;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get feed url", e);
-        }
-    }
-
-    @Override
-    public boolean hasNextPage() throws ParsingException {
-        return !nextPageUrl.isEmpty();
-    }
-
-    private String getUserUrl(Document d) throws ParsingException {
-        return d.select("span[class=\"qualified-channel-title-text\"]").first()
-                .select("a").first().attr("abs:href");
-    }
-
-    private boolean isUserUrl(String url) throws ParsingException {
-        return url.contains("/user/");
-    }
-
-    private String getNextPageUrl(Document d) throws ParsingException {
-        try {
-            Element button = d.select("button[class*=\"yt-uix-load-more\"]").first();
-            if(button != null) {
-                return button.attr("abs:data-uix-load-more-href");
-            } else {
-                // sometimes channels are simply so small, they don't have a second/next4q page
-                return "";
-            }
-        } catch(Exception e) {
-            throw new ParsingException("could not load next page url", e);
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java

@@ -1,47 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-/**
- * Created by Christian Schabesberger on 25.07.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeChannelUrlIdHandler.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeChannelUrlIdHandler implements UrlIdHandler {
-
-    public String getUrl(String channelId) {
-        return "https://www.youtube.com/" + channelId;
-    }
-
-    public String getId(String siteUrl) throws ParsingException {
-        return Parser.matchGroup1("/(user/[A-Za-z0-9_-]*|channel/[A-Za-z0-9_-]*)", siteUrl);
-    }
-
-    public String cleanUrl(String siteUrl) throws ParsingException {
-       return getUrl(getId(siteUrl));
-    }
-
-    public boolean acceptUrl(String videoUrl) {
-        return (videoUrl.contains("youtube") ||
-                videoUrl.contains("youtu.be")) &&
-                ( videoUrl.contains("/user/") ||
-                        videoUrl.contains("/channel/"));
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java

@@ -1,66 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-/**
- * Created by Christian Schabesberger on 02.03.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeParsingHelper.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeParsingHelper {
-
-    private YoutubeParsingHelper() {
-    }
-
-    public static int parseDurationString(String input)
-            throws ParsingException, NumberFormatException {
-        String[] splitInput = input.split(":");
-        String days = "0";
-        String hours = "0";
-        String minutes = "0";
-        String seconds;
-
-        switch(splitInput.length) {
-            case 4:
-                days = splitInput[0];
-                hours = splitInput[1];
-                minutes = splitInput[2];
-                seconds = splitInput[3];
-                break;
-            case 3:
-                hours = splitInput[0];
-                minutes = splitInput[1];
-                seconds = splitInput[2];
-                break;
-            case 2:
-                minutes = splitInput[0];
-                seconds = splitInput[1];
-                break;
-            case 1:
-                seconds = splitInput[0];
-                break;
-            default:
-                throw new ParsingException("Error duration string with unknown format: " + input);
-        }
-        return ((((Integer.parseInt(days) * 24)
-                + Integer.parseInt(hours) * 60)
-                + Integer.parseInt(minutes)) * 60)
-                + Integer.parseInt(seconds);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java

@@ -1,113 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.StreamPreviewInfoSearchCollector;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
-
-import java.net.URLEncoder;
-import java.io.IOException;
-
-
-/**
- * Created by Christian Schabesberger on 09.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeSearchEngine.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeSearchEngine extends SearchEngine {
-
-    private static final String TAG = YoutubeSearchEngine.class.toString();
-    public static final String CHARSET_UTF_8 = "UTF-8";
-
-    public YoutubeSearchEngine(UrlIdHandler urlIdHandler, int serviceId) {
-        super(urlIdHandler, serviceId);
-    }
-
-    @Override
-    public StreamPreviewInfoSearchCollector search(String query, int page, String languageCode)
-            throws IOException, ExtractionException {
-        StreamPreviewInfoSearchCollector collector = getStreamPreviewInfoSearchCollector();
-
-        Downloader downloader = NewPipe.getDownloader();
-
-        String url = "https://www.youtube.com/results"
-                + "?search_query=" + URLEncoder.encode(query, CHARSET_UTF_8)
-                + "&page=" + Integer.toString(page + 1)
-                + "&filters=" + "video";
-
-        String site;
-        //String url = builder.build().toString();
-        //if we've been passed a valid language code, append it to the URL
-        if(!languageCode.isEmpty()) {
-            //assert Pattern.matches("[a-z]{2}(-([A-Z]{2}|[0-9]{1,3}))?", languageCode);
-            site  = downloader.download(url, languageCode);
-        }
-        else {
-            site = downloader.download(url);
-        }
-
-        Document doc = Jsoup.parse(site, url);
-        Element list = doc.select("ol[class=\"item-section\"]").first();
-
-        for (Element item : list.children()) {
-            /* First we need to determine which kind of item we are working with.
-               Youtube depicts five different kinds of items on its search result page. These are
-               regular videos, playlists, channels, two types of video suggestions, and a "no video
-               found" item. Since we only want videos, we need to filter out all the others.
-               An example for this can be seen here:
-               https://www.youtube.com/results?search_query=asdf&page=1
-
-               We already applied a filter to the url, so we don't need to care about channels and
-               playlists now.
-            */
-
-            Element el;
-
-            // both types of spell correction item
-            if ((el = item.select("div[class*=\"spell-correction\"]").first()) != null) {
-                collector.setSuggestion(el.select("a").first().text());
-                if(list.children().size() == 1) {
-                    throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
-                }
-                // search message item
-            } else if ((el = item.select("div[class*=\"search-message\"]").first()) != null) {
-                //result.errorMessage = el.text();
-                throw new NothingFoundException(el.text());
-
-                // video item type
-            } else if ((el = item.select("div[class*=\"yt-lockup-video\"").first()) != null) {
-                collector.commit(extractPreviewInfo(el));
-            } else {
-                //noinspection ConstantConditions
-                collector.addError(new Exception("unexpected element found:\"" + el + "\""));
-            }
-        }
-
-        return collector;
-    }
-
-    private StreamPreviewInfoExtractor extractPreviewInfo(final Element item) {
-        return new YoutubeStreamPreviewInfoExtractor(item);
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java

@@ -1,82 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.channel.ChannelExtractor;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SearchEngine;
-import org.schabi.newpipe.extractor.search.SuggestionExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-
-import java.io.IOException;
-
-
-/**
- * Created by Christian Schabesberger on 23.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeService.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeService extends StreamingService {
-
-    public YoutubeService(int id) {
-        super(id);
-    }
-
-    @Override
-    public ServiceInfo getServiceInfo() {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.name = "Youtube";
-        return serviceInfo;
-    }
-    @Override
-    public StreamExtractor getExtractorInstance(String url)
-            throws ExtractionException, IOException {
-        UrlIdHandler urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
-        if(urlIdHandler.acceptUrl(url)) {
-            return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
-        }
-        else {
-            throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
-        }
-    }
-    @Override
-    public SearchEngine getSearchEngineInstance() {
-        return new YoutubeSearchEngine(getUrlIdHandlerInstance(), getServiceId());
-    }
-
-    @Override
-    public UrlIdHandler getUrlIdHandlerInstance() {
-        return YoutubeStreamUrlIdHandler.getInstance();
-    }
-
-    @Override
-    public UrlIdHandler getChannelUrlIdHandlerInstance() {
-        return new YoutubeChannelUrlIdHandler();
-    }
-
-    @Override
-    public ChannelExtractor getChannelExtractorInstance(String url, int page)
-        throws ExtractionException, IOException {
-        return new YoutubeChannelExtractor(getChannelUrlIdHandlerInstance(), url, page, getServiceId());
-    }
-
-    @Override
-    public SuggestionExtractor getSuggestionExtractorInstance() {
-        return new YoutubeSuggestionExtractor(getServiceId());
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java

@@ -1,857 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.stream_info.AudioStream;
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoCollector;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by Christian Schabesberger on 06.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeStreamExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeStreamExtractor extends StreamExtractor {
-    public static final String URL_ENCODED_FMT_STREAM_MAP = "url_encoded_fmt_stream_map";
-    public static final String HTTPS = "https:";
-    public static final String CONTENT = "content";
-    public static final String REGEX_INT = "[^\\d]";
-
-    // exceptions
-
-    public class DecryptException extends ParsingException {
-        DecryptException(String message, Throwable cause) {
-            super(message, cause);
-        }
-    }
-
-    // special content not available exceptions
-
-    public class GemaException extends ContentNotAvailableException {
-        GemaException(String message) {
-            super(message);
-        }
-    }
-
-    public class LiveStreamException extends ContentNotAvailableException {
-        LiveStreamException(String message) {
-            super(message);
-        }
-    }
-
-    // ----------------
-
-    // Sometimes if the html page of youtube is already downloaded, youtube web page will internally
-    // download the /get_video_info page. Since a certain date dashmpd url is only available over
-    // this /get_video_info page, so we always need to download this one to.
-    // %%video_id%% will be replaced by the actual video id
-    // $$el_type$$ will be replaced by the actual el_type (se the declarations below)
-    private static final String GET_VIDEO_INFO_URL =
-            "https://www.youtube.com/get_video_info?video_id=%%video_id%%$$el_type$$&ps=default&eurl=&gl=US&hl=en";
-    // eltype is necessary for the url above
-    private static final String EL_INFO = "el=info";
-
-    public enum ItagType {
-        AUDIO,
-        VIDEO,
-        VIDEO_ONLY
-    }
-
-    private static class ItagItem {
-        public ItagItem(int id, ItagType type, MediaFormat format, String res, int fps) {
-            this.id = id;
-            this.itagType = type;
-            this.mediaFormatId = format.id;
-            this.resolutionString = res;
-            this.fps = fps;
-        }
-        public ItagItem(int id, ItagType type, MediaFormat format, int samplingRate, int bandWidth) {
-            this.id = id;
-            this.itagType = type;
-            this.mediaFormatId = format.id;
-            this.samplingRate = samplingRate;
-            this.bandWidth = bandWidth;
-        }
-        public int id;
-        public ItagType itagType;
-        public int mediaFormatId;
-        public String resolutionString;
-        public int fps = -1;
-        public int samplingRate = -1;
-        public int bandWidth = -1;
-    }
-
-    private static final ItagItem[] itagList = {
-            // video streams
-            //           id, ItagType,       MediaFormat,    Resolution, fps
-            new ItagItem(17, ItagType.VIDEO, MediaFormat.v3GPP, "144p", 12),
-            new ItagItem(18, ItagType.VIDEO, MediaFormat.MPEG_4, "360p", 24),
-            new ItagItem(22, ItagType.VIDEO, MediaFormat.MPEG_4, "720p", 24),
-            new ItagItem(36, ItagType.VIDEO, MediaFormat.v3GPP, "240p", 24),
-            new ItagItem(37, ItagType.VIDEO, MediaFormat.MPEG_4, "1080p", 24),
-            new ItagItem(38, ItagType.VIDEO, MediaFormat.MPEG_4, "1080p", 24),
-            new ItagItem(43, ItagType.VIDEO, MediaFormat.WEBM, "360p", 24),
-            new ItagItem(44, ItagType.VIDEO, MediaFormat.WEBM, "480p", 24),
-            new ItagItem(45, ItagType.VIDEO, MediaFormat.WEBM, "720p", 24),
-            new ItagItem(46, ItagType.VIDEO, MediaFormat.WEBM, "1080p", 24),
-            // audio streams
-            //           id, ItagType,       MediaFormat,    samplingR, bandwidth
-            new ItagItem(249, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),  // bandwith/samplingR 0 because not known
-            new ItagItem(250, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
-            new ItagItem(171, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
-            new ItagItem(140, ItagType.AUDIO, MediaFormat.M4A, 0, 0),
-            new ItagItem(251, ItagType.AUDIO, MediaFormat.WEBMA, 0, 0),
-            // video only streams
-            new ItagItem(160, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "144p", 24),
-            new ItagItem(133, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "240p", 24),
-            new ItagItem(134, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "360p", 24),
-            new ItagItem(135, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "480p", 24),
-            new ItagItem(136, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "720p", 24),
-            new ItagItem(137, ItagType.VIDEO_ONLY, MediaFormat.MPEG_4, "1080p", 24),
-    };
-
-    /**These lists only contain itag formats that are supported by the common Android Video player.
-     However if you are looking for a list showing all itag formats, look at
-     https://github.com/rg3/youtube-dl/issues/1687 */
-
-    public static boolean itagIsSupported(int itag) {
-        for(ItagItem item : itagList) {
-            if(itag == item.id) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static ItagItem getItagItem(int itag) throws ParsingException {
-        for(ItagItem item : itagList) {
-            if(itag == item.id) {
-                return item;
-            }
-        }
-        throw new ParsingException("itag=" + Integer.toString(itag) + " not supported");
-    }
-
-    private static final String TAG = YoutubeStreamExtractor.class.toString();
-    private final Document doc;
-    private JSONObject playerArgs;
-    private boolean isAgeRestricted;
-    private Map<String, String> videoInfoPage;
-
-    // static values
-    private static final String DECRYPTION_FUNC_NAME="decrypt";
-
-    // cached values
-    private static volatile String decryptionCode = "";
-
-    UrlIdHandler urlidhandler = YoutubeStreamUrlIdHandler.getInstance();
-    String pageUrl = "";
-
-    public YoutubeStreamExtractor(UrlIdHandler urlIdHandler, String pageUrl, int serviceId)
-            throws ExtractionException, IOException {
-        super(urlIdHandler, pageUrl, serviceId);
-        //most common videoInfo fields are now set in our superclass, for all services
-        this.pageUrl = pageUrl;
-        Downloader downloader = NewPipe.getDownloader();
-        String pageContent = downloader.download(urlidhandler.cleanUrl(pageUrl));
-        doc = Jsoup.parse(pageContent, pageUrl);
-        JSONObject ytPlayerConfig;
-        String playerUrl;
-
-        // Check if the video is age restricted
-        if (pageContent.contains("<meta property=\"og:restrictions:age")) {
-            String videoInfoUrl = GET_VIDEO_INFO_URL.replace("%%video_id%%",
-                    urlidhandler.getId(pageUrl)).replace("$$el_type$$", "&" + EL_INFO);
-            String videoInfoPageString = downloader.download(videoInfoUrl);
-            videoInfoPage = Parser.compatParseMap(videoInfoPageString);
-            playerUrl = getPlayerUrlFromRestrictedVideo(pageUrl);
-            isAgeRestricted = true;
-        } else {
-            ytPlayerConfig = getPlayerConfig(pageContent);
-            playerArgs = getPlayerArgs(ytPlayerConfig);
-            playerUrl = getPlayerUrl(ytPlayerConfig);
-            isAgeRestricted = false;
-        }
-
-        if(decryptionCode.isEmpty()) {
-            decryptionCode = loadDecryptionCode(playerUrl);
-        }
-    }
-
-    private JSONObject getPlayerConfig(String pageContent) throws ParsingException {
-        try {
-            String ytPlayerConfigRaw =
-                    Parser.matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContent);
-            return new JSONObject(ytPlayerConfigRaw);
-        } catch (Parser.RegexException e) {
-            String errorReason = findErrorReason(doc);
-            switch(errorReason) {
-                case "GEMA":
-                    throw new GemaException(errorReason);
-                case "":
-                    throw new ContentNotAvailableException("Content not available: player config empty", e);
-                default:
-                    throw new ContentNotAvailableException("Content not available", e);
-            }
-        } catch (JSONException e) {
-            throw new ParsingException("Could not parse yt player config", e);
-        }
-    }
-
-    private JSONObject getPlayerArgs(JSONObject playerConfig) throws ParsingException {
-        JSONObject playerArgs;
-
-        //attempt to load the youtube js player JSON arguments
-        boolean isLiveStream = false; //used to determine if this is a livestream or not
-        try {
-            playerArgs = playerConfig.getJSONObject("args");
-
-            // check if we have a live stream. We need to filter it, since its not yet supported.
-            if((playerArgs.has("ps") && playerArgs.get("ps").toString().equals("live"))
-                    || (playerArgs.get(URL_ENCODED_FMT_STREAM_MAP).toString().isEmpty())) {
-                isLiveStream = true;
-            }
-        }  catch (JSONException e) {
-            throw new ParsingException("Could not parse yt player config", e);
-        }
-        if (isLiveStream) {
-            throw new LiveStreamException("This is a Life stream. Can't use those right now.");
-        }
-
-        return playerArgs;
-    }
-
-    private String getPlayerUrl(JSONObject playerConfig) throws ParsingException {
-        try {
-            // The Youtube service needs to be initialized by downloading the
-            // js-Youtube-player. This is done in order to get the algorithm
-            // for decrypting cryptic signatures inside certain stream urls.
-            String playerUrl = "";
-
-            JSONObject ytAssets = playerConfig.getJSONObject("assets");
-            playerUrl = ytAssets.getString("js");
-
-            if (playerUrl.startsWith("//")) {
-                playerUrl = HTTPS + playerUrl;
-            }
-            return playerUrl;
-        } catch (JSONException e) {
-            throw new ParsingException(
-                    "Could not load decryption code for the Youtube service.", e);
-        }
-    }
-
-    private String getPlayerUrlFromRestrictedVideo(String pageUrl) throws ParsingException, ReCaptchaException {
-        try {
-            Downloader downloader = NewPipe.getDownloader();
-            String playerUrl = "";
-            String videoId = urlidhandler.getId(pageUrl);
-            String embedUrl = "https://www.youtube.com/embed/" + videoId;
-            String embedPageContent = downloader.download(embedUrl);
-            //todo: find out if this can be reapaced by Parser.matchGroup1()
-            Pattern assetsPattern = Pattern.compile("\"assets\":.+?\"js\":\\s*(\"[^\"]+\")");
-            Matcher patternMatcher = assetsPattern.matcher(embedPageContent);
-            while (patternMatcher.find()) {
-                playerUrl = patternMatcher.group(1);
-            }
-            playerUrl = playerUrl.replace("\\", "").replace("\"", "");
-
-            if (playerUrl.startsWith("//")) {
-                playerUrl = HTTPS + playerUrl;
-            }
-            return playerUrl;
-        } catch (IOException e) {
-            throw new ParsingException(
-                    "Could load decryption code form restricted video for the Youtube service.", e);
-        } catch (ReCaptchaException e) {
-            throw new ReCaptchaException("reCaptcha Challenge requested");
-        }
-    }
-
-    @Override
-    public String getTitle() throws ParsingException {
-        try {
-            if (playerArgs == null) {
-                return videoInfoPage.get("title");
-            }
-            //json player args method
-            return playerArgs.getString("title");
-        } catch(JSONException je) {//html <meta> method
-            je.printStackTrace();
-            System.err.println("failed to load title from JSON args; trying to extract it from HTML");
-            try { // fall through to fall-back
-                return doc.select("meta[name=title]").attr(CONTENT);
-            } catch (Exception e) {
-                throw new ParsingException("failed permanently to load title.", e);
-            }
-        }
-    }
-
-    @Override
-    public String getDescription() throws ParsingException {
-        try {
-            return doc.select("p[id=\"eow-description\"]").first().html();
-        } catch (Exception e) {//todo: add fallback method <-- there is no ... as long as i know
-            throw new ParsingException("failed to load description.", e);
-        }
-    }
-
-    @Override
-    public String getUploader() throws ParsingException {
-        try {
-            if (playerArgs == null) {
-                return videoInfoPage.get("author");
-            }
-            //json player args method
-            return playerArgs.getString("author");
-        } catch(JSONException je) {
-            je.printStackTrace();
-            System.err.println(
-                    "failed to load uploader name from JSON args; trying to extract it from HTML");
-        } try {//fall through to fallback HTML method
-            return doc.select("div.yt-user-info").first().text();
-        } catch (Exception e) {
-            throw new ParsingException("failed permanently to load uploader name.", e);
-        }
-    }
-
-    @Override
-    public int getLength() throws ParsingException {
-        try {
-            if (playerArgs == null) {
-                return Integer.valueOf(videoInfoPage.get("length_seconds"));
-            }
-            return playerArgs.getInt("length_seconds");
-        } catch (JSONException e) {//todo: find fallback method
-            throw new ParsingException("failed to load video duration from JSON args", e);
-        }
-    }
-
-    @Override
-    public long getViewCount() throws ParsingException {
-        try {
-            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr(CONTENT);
-            return Long.parseLong(viewCountString);
-        } catch (Exception e) {//todo: find fallback method
-            throw new ParsingException("failed to get number of views", e);
-        }
-    }
-
-    @Override
-    public String getUploadDate() throws ParsingException {
-        try {
-            return doc.select("meta[itemprop=datePublished]").attr(CONTENT);
-        } catch (Exception e) {//todo: add fallback method
-            throw new ParsingException("failed to get upload date.", e);
-        }
-    }
-
-    @Override
-    public String getThumbnailUrl() throws ParsingException {
-        //first attempt getting a small image version
-        //in the html extracting part we try to get a thumbnail with a higher resolution
-        // Try to get high resolution thumbnail if it fails use low res from the player instead
-        try {
-            return doc.select("link[itemprop=\"thumbnailUrl\"]").first().attr("abs:href");
-        } catch(Exception e) {
-            System.err.println("Could not find high res Thumbnail. Using low res instead");
-        }
-        try { //fall through to fallback
-            return playerArgs.getString("thumbnail_url");
-        } catch (JSONException je) {
-            throw new ParsingException(
-                    "failed to extract thumbnail URL from JSON args; trying to extract it from HTML", je);
-        } catch (NullPointerException ne) {
-            // Get from the video info page instead
-            return videoInfoPage.get("thumbnail_url");
-        }
-    }
-
-    @Override
-    public String getUploaderThumbnailUrl() throws ParsingException {
-        try {
-            return doc.select("a[class*=\"yt-user-photo\"]").first()
-                    .select("img").first()
-                    .attr("abs:data-thumb");
-        } catch (Exception e) {//todo: add fallback method
-            throw new ParsingException("failed to get uploader thumbnail URL.", e);
-        }
-    }
-
-    @Override
-    public String getDashMpdUrl() throws ParsingException {
-        /*
-        try {
-            String dashManifestUrl = videoInfoPage.get("dashmpd");
-            if(!dashManifestUrl.contains("/signature/")) {
-                String encryptedSig = Parser.matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifestUrl);
-                String decryptedSig;
-
-                decryptedSig = decryptSignature(encryptedSig, decryptionCode);
-                dashManifestUrl = dashManifestUrl.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
-            }
-            return dashManifestUrl;
-        } catch (Exception e) {
-            throw new ParsingException(
-                    "Could not get \"dashmpd\" maybe VideoInfoPage is broken.", e);
-        }
-        */
-        return "";
-    }
-
-
-    @Override
-    public List<AudioStream> getAudioStreams() throws ParsingException {
-        Vector<AudioStream> audioStreams = new Vector<>();
-        try{
-            String encodedUrlMap;
-            // playerArgs could be null if the video is age restricted
-            if (playerArgs == null) {
-                encodedUrlMap = videoInfoPage.get("adaptive_fmts");
-            } else {
-                encodedUrlMap = playerArgs.getString("adaptive_fmts");
-            }
-            for(String url_data_str : encodedUrlMap.split(",")) {
-                // This loop iterates through multiple streams, therefor tags
-                // is related to one and the same stream at a time.
-                Map<String, String> tags = Parser.compatParseMap(
-                        org.jsoup.parser.Parser.unescapeEntities(url_data_str, true));
-
-                int itag = Integer.parseInt(tags.get("itag"));
-
-                if (itagIsSupported(itag)) {
-                    ItagItem itagItem = getItagItem(itag);
-                    if (itagItem.itagType == ItagType.AUDIO) {
-                        String streamUrl = tags.get("url");
-                        // if video has a signature: decrypt it and add it to the url
-                        if (tags.get("s") != null) {
-                            streamUrl = streamUrl + "&signature="
-                                    + decryptSignature(tags.get("s"), decryptionCode);
-                        }
-
-                        audioStreams.add(new AudioStream(streamUrl,
-                                itagItem.mediaFormatId,
-                                itagItem.bandWidth,
-                                itagItem.samplingRate));
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new ParsingException("Could not get audiostreams", e);
-        }
-        return audioStreams;
-    }
-
-    @Override
-    public List<VideoStream> getVideoStreams() throws ParsingException {
-        Vector<VideoStream> videoStreams = new Vector<>();
-
-        try{
-            String encodedUrlMap;
-            // playerArgs could be null if the video is age restricted
-            if (playerArgs == null) {
-                encodedUrlMap = videoInfoPage.get(URL_ENCODED_FMT_STREAM_MAP);
-            } else {
-                encodedUrlMap = playerArgs.getString(URL_ENCODED_FMT_STREAM_MAP);
-            }
-            for(String url_data_str : encodedUrlMap.split(",")) {
-                try {
-                    // This loop iterates through multiple streams, therefor tags
-                    // is related to one and the same stream at a time.
-                    Map<String, String> tags = Parser.compatParseMap(
-                            org.jsoup.parser.Parser.unescapeEntities(url_data_str, true));
-
-                    int itag = Integer.parseInt(tags.get("itag"));
-
-                    if (itagIsSupported(itag)) {
-                        ItagItem itagItem = getItagItem(itag);
-                        if(itagItem.itagType == ItagType.VIDEO) {
-                            String streamUrl = tags.get("url");
-                            // if video has a signature: decrypt it and add it to the url
-                            if (tags.get("s") != null) {
-                                streamUrl = streamUrl + "&signature="
-                                        + decryptSignature(tags.get("s"), decryptionCode);
-                            }
-                            videoStreams.add(new VideoStream(
-                                    streamUrl,
-                                    itagItem.mediaFormatId,
-                                    itagItem.resolutionString));
-                        }
-                    }
-                } catch (Exception e) {
-                    //todo: dont log throw an error
-                    System.err.println("Could not get Video stream.");
-                    e.printStackTrace();
-                }
-            }
-
-        } catch (Exception e) {
-            throw new ParsingException("Failed to get video streams", e);
-        }
-
-        if(videoStreams.isEmpty()) {
-            throw new ParsingException("Failed to get any video stream");
-        }
-        return videoStreams;
-    }
-
-    @Override
-    public List<VideoStream> getVideoOnlyStreams() throws ParsingException {
-        return null;
-    }
-
-    /**Attempts to parse (and return) the offset to start playing the video from.
-     * @return the offset (in seconds), or 0 if no timestamp is found.*/
-    @Override
-    public int getTimeStamp() throws ParsingException {
-        String timeStamp;
-        try {
-            timeStamp = Parser.matchGroup1("((#|&|\\?)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)", pageUrl);
-        } catch (Parser.RegexException e) {
-            // catch this instantly since an url does not necessarily have to have a time stamp
-
-            // -2 because well the testing system will then know its the regex that failed :/
-            // not good i know
-            return -2;
-        }
-
-        if(!timeStamp.isEmpty()) {
-            try {
-                String secondsString = "";
-                String minutesString = "";
-                String hoursString = "";
-                try {
-                    secondsString = Parser.matchGroup1("(\\d{1,3})s", timeStamp);
-                    minutesString = Parser.matchGroup1("(\\d{1,3})m", timeStamp);
-                    hoursString = Parser.matchGroup1("(\\d{1,3})h", timeStamp);
-                } catch (Exception e) {
-                    //it could be that time is given in another method
-                    if (secondsString.isEmpty() //if nothing was got,
-                            && minutesString.isEmpty()//treat as unlabelled seconds
-                            && hoursString.isEmpty()) {
-                        secondsString = Parser.matchGroup1("t=(\\d+)", timeStamp);
-                    }
-                }
-
-                int seconds = secondsString.isEmpty() ? 0 : Integer.parseInt(secondsString);
-                int minutes = minutesString.isEmpty() ? 0 : Integer.parseInt(minutesString);
-                int hours = hoursString.isEmpty() ? 0 : Integer.parseInt(hoursString);
-
-                //don't trust BODMAS!
-                return seconds + (60 * minutes) + (3600 * hours);
-                //Log.d(TAG, "derived timestamp value:"+ret);
-                //the ordering varies internationally
-            } catch (ParsingException e) {
-                throw new ParsingException("Could not get timestamp.", e);
-            }
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public int getAgeLimit() throws ParsingException {
-        if (!isAgeRestricted) {
-            return 0;
-        }
-        try {
-            return Integer.valueOf(doc.head()
-                    .getElementsByAttributeValue("property", "og:restrictions:age")
-                    .attr(CONTENT).replace("+", ""));
-        } catch (Exception e) {
-            throw new ParsingException("Could not get age restriction");
-        }
-    }
-
-    @Override
-    public String getAverageRating() throws ParsingException {
-        try {
-            if (playerArgs == null) {
-                return videoInfoPage.get("avg_rating");
-            }
-            return playerArgs.getString("avg_rating");
-        } catch (JSONException e) {
-            throw new ParsingException("Could not get Average rating", e);
-        }
-    }
-
-    @Override
-    public int getLikeCount() throws ParsingException {
-        String likesString = "";
-        try {
-
-            Element button = doc.select("button.like-button-renderer-like-button").first();
-            try {
-                likesString = button.select("span.yt-uix-button-content").first().text();
-            } catch (NullPointerException e) {
-                //if this ckicks in our button has no content and thefore likes/dislikes are disabled
-                return -1;
-            }
-            return Integer.parseInt(likesString.replaceAll(REGEX_INT, ""));
-        } catch (NumberFormatException nfe) {
-            throw new ParsingException(
-                    "failed to parse likesString \"" + likesString + "\" as integers", nfe);
-        } catch (Exception e) {
-            throw new ParsingException("Could not get like count", e);
-        }
-    }
-
-    @Override
-    public int getDislikeCount() throws ParsingException {
-        String dislikesString = "";
-        try {
-            Element button = doc.select("button.like-button-renderer-dislike-button").first();
-            try {
-                dislikesString = button.select("span.yt-uix-button-content").first().text();
-            } catch (NullPointerException e) {
-                //if this kicks in our button has no content and therefore likes/dislikes are disabled
-                return -1;
-            }
-            return Integer.parseInt(dislikesString.replaceAll(REGEX_INT, ""));
-        } catch(NumberFormatException nfe) {
-            throw new ParsingException(
-                    "failed to parse dislikesString \"" + dislikesString + "\" as integers", nfe);
-        } catch(Exception e) {
-            throw new ParsingException("Could not get dislike count", e);
-        }
-    }
-
-    @Override
-    public StreamPreviewInfoExtractor getNextVideo() throws ParsingException {
-        try {
-            return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                    .select("li").first());
-        } catch(Exception e) {
-            throw new ParsingException("Could not get next video", e);
-        }
-    }
-
-    @Override
-    public StreamPreviewInfoCollector getRelatedVideos() throws ParsingException {
-        try {
-            StreamPreviewInfoCollector collector = getStreamPreviewInfoCollector();
-            Element ul = doc.select("ul[id=\"watch-related\"]").first();
-            if(ul != null) {
-                for (Element li : ul.children()) {
-                    // first check if we have a playlist. If so leave them out
-                    if (li.select("a[class*=\"content-link\"]").first() != null) {
-                        collector.commit(extractVideoPreviewInfo(li));
-                    }
-                }
-            }
-            return collector;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get related videos", e);
-        }
-    }
-
-    @Override
-    public String getPageUrl() {
-        return pageUrl;
-    }
-
-    @Override
-    public String getChannelUrl() throws ParsingException {
-        try {
-            return doc.select("div[class=\"yt-user-info\"]").first().children()
-                    .select("a").first().attr("abs:href");
-        } catch(Exception e) {
-            throw new ParsingException("Could not get channel link", e);
-        }
-    }
-
-    @Override
-    public StreamInfo.StreamType getStreamType() throws ParsingException {
-        //todo: if implementing livestream support this value should be generated dynamically
-        return StreamInfo.StreamType.VIDEO_STREAM;
-    }
-
-    /**Provides information about links to other videos on the video page, such as related videos.
-     * This is encapsulated in a StreamPreviewInfo object,
-     * which is a subset of the fields in a full StreamInfo.*/
-    private StreamPreviewInfoExtractor extractVideoPreviewInfo(final Element li) {
-        return new StreamPreviewInfoExtractor() {
-            @Override
-            public AbstractStreamInfo.StreamType getStreamType() throws ParsingException {
-                return null;
-            }
-
-            @Override
-            public String getWebPageUrl() throws ParsingException {
-                return li.select("a.content-link").first().attr("abs:href");
-            }
-
-            @Override
-            public String getTitle() throws ParsingException {
-                //todo: check NullPointerException causing
-                return li.select("span.title").first().text();
-                //this page causes the NullPointerException, after finding it by searching for "tjvg":
-                //https://www.youtube.com/watch?v=Uqg0aEhLFAg
-            }
-
-            @Override
-            public int getDuration() throws ParsingException {
-                return YoutubeParsingHelper.parseDurationString(
-                        li.select("span.video-time").first().text());
-            }
-
-            @Override
-            public String getUploader() throws ParsingException {
-                return li.select("span.g-hovercard").first().text();
-            }
-
-            @Override
-            public String getUploadDate() throws ParsingException {
-                return null;
-            }
-
-            @Override
-            public long getViewCount() throws ParsingException {
-                //this line is unused
-                //String views = li.select("span.view-count").first().text();
-
-                //Log.i(TAG, "title:"+info.title);
-                //Log.i(TAG, "view count:"+views);
-
-                try {
-                    return Long.parseLong(li.select("span.view-count")
-                            .first().text().replaceAll(REGEX_INT, ""));
-                } catch (Exception e) {
-                    //related videos sometimes have no view count
-                    return 0;
-                }
-            }
-
-            @Override
-            public String getThumbnailUrl() throws ParsingException {
-                Element img = li.select("img").first();
-                String thumbnailUrl = img.attr("abs:src");
-                // Sometimes youtube sends links to gif files which somehow seem to not exist
-                // anymore. Items with such gif also offer a secondary image source. So we are going
-                // to use that if we caught such an item.
-                if (thumbnailUrl.contains(".gif")) {
-                    thumbnailUrl = img.attr("data-thumb");
-                }
-                if (thumbnailUrl.startsWith("//")) {
-                    thumbnailUrl = HTTPS + thumbnailUrl;
-                }
-                return thumbnailUrl;
-            }
-        };
-    }
-
-
-    private String loadDecryptionCode(String playerUrl) throws DecryptException {
-        String decryptionFuncName;
-        String decryptionFunc;
-        String helperObjectName;
-        String helperObject;
-        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
-        String decryptionCode;
-
-        try {
-            Downloader downloader = NewPipe.getDownloader();
-            if(!playerUrl.contains("https://youtube.com")) {
-                //sometimes the https://youtube.com part does not get send with
-                //than we have to add it by hand
-                playerUrl = "https://youtube.com" + playerUrl;
-            }
-            String playerCode = downloader.download(playerUrl);
-
-            decryptionFuncName =
-                    Parser.matchGroup("([\"\\'])signature\\1\\s*,\\s*([a-zA-Z0-9$]+)\\(", playerCode, 2);
-
-            String functionPattern = "("
-                    + decryptionFuncName.replace("$", "\\$")
-                    + "=function\\([a-zA-Z0-9_]+\\)\\{.+?\\})";
-            decryptionFunc = "var " + Parser.matchGroup1(functionPattern, playerCode) + ";";
-
-            helperObjectName = Parser
-                    .matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
-
-            String helperPattern = "(var "
-                    + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)";
-            helperObject = Parser.matchGroup1(helperPattern, playerCode);
-
-
-            callerFunc = callerFunc.replace("%%", decryptionFuncName);
-            decryptionCode = helperObject + decryptionFunc + callerFunc;
-        } catch(IOException ioe) {
-            throw new DecryptException("Could not load decrypt function", ioe);
-        } catch(Exception e) {
-            throw new DecryptException("Could not parse decrypt function ", e);
-        }
-
-        return decryptionCode;
-    }
-
-    private String decryptSignature(String encryptedSig, String decryptionCode)
-            throws DecryptException{
-        Context context = Context.enter();
-        context.setOptimizationLevel(-1);
-        Object result = null;
-        try {
-            ScriptableObject scope = context.initStandardObjects();
-            context.evaluateString(scope, decryptionCode, "decryptionCode", 1, null);
-            Function decryptionFunc = (Function) scope.get("decrypt", scope);
-            result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
-        } catch (Exception e) {
-            throw new DecryptException("could not get decrypt signature", e);
-        } finally {
-            Context.exit();
-        }
-        return result == null ? "" : result.toString();
-    }
-
-    private String findErrorReason(Document doc) {
-        String errorMessage = doc.select("h1[id=\"unavailable-message\"]").first().text();
-        if(errorMessage.contains("GEMA")) {
-            // Gema sometimes blocks youtube music content in germany:
-            // https://www.gema.de/en/
-            // Detailed description:
-            // https://en.wikipedia.org/wiki/GEMA_%28German_organization%29
-            return "GEMA";
-        }
-        return "";
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamPreviewInfoExtractor.java

@@ -1,169 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfoExtractor;
-
-/**
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeStreamPreviewInfoExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeStreamPreviewInfoExtractor implements StreamPreviewInfoExtractor {
-
-    private final Element item;
-
-    public YoutubeStreamPreviewInfoExtractor(Element item) {
-        this.item = item;
-    }
-
-    @Override
-    public String getWebPageUrl() throws ParsingException {
-        try {
-            Element el = item.select("div[class*=\"yt-lockup-video\"").first();
-            Element dl = el.select("h3").first().select("a").first();
-            return dl.attr("abs:href");
-        } catch (Exception e) {
-            throw new ParsingException("Could not get web page url for the video", e);
-        }
-    }
-
-    @Override
-    public String getTitle() throws ParsingException {
-        try {
-            Element el = item.select("div[class*=\"yt-lockup-video\"").first();
-            Element dl = el.select("h3").first().select("a").first();
-            return dl.text();
-        } catch (Exception e) {
-            throw new ParsingException("Could not get title", e);
-        }
-    }
-
-    @Override
-    public int getDuration() throws ParsingException {
-        try {
-            return YoutubeParsingHelper.parseDurationString(
-                    item.select("span[class=\"video-time\"]").first().text());
-        } catch(Exception e) {
-            if(isLiveStream(item)) {
-                // -1 for no duration
-                return -1;
-            } else {
-                throw new ParsingException("Could not get Duration: " + getTitle(), e);
-            }
-        }
-    }
-
-    @Override
-    public String getUploader() throws ParsingException {
-        try {
-            return item.select("div[class=\"yt-lockup-byline\"]").first()
-                    .select("a").first()
-                    .text();
-        } catch (Exception e) {
-            throw new ParsingException("Could not get uploader", e);
-        }
-    }
-
-    @Override
-    public String getUploadDate() throws ParsingException {
-        try {
-            return item.select("div[class=\"yt-lockup-meta\"]").first()
-                    .select("li").first()
-                    .text();
-        } catch(Exception e) {
-            throw new ParsingException("Could not get uplaod date", e);
-        }
-    }
-
-    @Override
-    public long getViewCount() throws ParsingException {
-        String output;
-        String input;
-        try {
-            input = item.select("div[class=\"yt-lockup-meta\"]").first()
-                    .select("li").get(1)
-                    .text();
-        } catch (IndexOutOfBoundsException e) {
-            if(isLiveStream(item)) {
-                // -1 for no view count
-                return -1;
-            } else {
-                throw new ParsingException(
-                        "Could not parse yt-lockup-meta although available: " + getTitle(), e);
-            }
-        }
-
-        output = Parser.matchGroup1("([0-9,\\. ]*)", input)
-                .replace(" ", "")
-                .replace(".", "")
-                .replace(",", "");
-
-        try {
-            return Long.parseLong(output);
-        } catch (NumberFormatException e) {
-            // if this happens the video probably has no views
-            if(!input.isEmpty()) {
-                return 0;
-            } else {
-                throw new ParsingException("Could not handle input: " + input, e);
-            }
-        }
-    }
-
-    @Override
-    public String getThumbnailUrl() throws ParsingException {
-        try {
-            String url;
-            Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
-                    .select("img").first();
-            url = te.attr("abs:src");
-            // Sometimes youtube sends links to gif files which somehow seem to not exist
-            // anymore. Items with such gif also offer a secondary image source. So we are going
-            // to use that if we've caught such an item.
-            if (url.contains(".gif")) {
-                url = te.attr("abs:data-thumb");
-            }
-            return url;
-        } catch (Exception e) {
-            throw new ParsingException("Could not get thumbnail url", e);
-        }
-    }
-
-    @Override
-    public AbstractStreamInfo.StreamType getStreamType() {
-        if(isLiveStream(item)) {
-            return AbstractStreamInfo.StreamType.LIVE_STREAM;
-        } else {
-            return AbstractStreamInfo.StreamType.VIDEO_STREAM;
-        }
-    }
-
-    private boolean isLiveStream(Element item) {
-        Element bla = item.select("span[class*=\"yt-badge-live\"]").first();
-
-        if(bla == null) {
-            // sometimes livestreams dont have badges but sill are live streams
-            // if video time is not available we most likly have an offline livestream
-            if(item.select("span[class*=\"video-time\"]").first() == null) {
-                return true;
-            }
-        }
-        return bla != null;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java

@@ -1,156 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import android.support.annotation.NonNull;
-
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.Parser;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.FoundAdException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URLDecoder;
-import java.util.regex.Matcher;
-
-/**
- * Created by Christian Schabesberger on 02.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeStreamUrlIdHandler.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
-
-    private static final YoutubeStreamUrlIdHandler instance = new YoutubeStreamUrlIdHandler();
-    private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{11})";
-
-    private YoutubeStreamUrlIdHandler() {}
-
-    public static YoutubeStreamUrlIdHandler getInstance() {
-        return instance;
-    }
-
-    @Override
-    public String getUrl(String videoId) {
-        return "https://www.youtube.com/watch?v=" + videoId;
-    }
-
-    @Override
-    public String getId(String url) throws ParsingException, IllegalArgumentException {
-        if(url.isEmpty()) {
-            throw new IllegalArgumentException("The url parameter should not be empty");
-        }
-
-        String id;
-        String lowercaseUrl = url.toLowerCase();
-        if(lowercaseUrl.contains("youtube")) {
-            if (url.contains("attribution_link")) {
-                try {
-                    String escapedQuery = Parser.matchGroup1("u=(.[^&|$]*)", url);
-                    String query = URLDecoder.decode(escapedQuery, "UTF-8");
-                    id = Parser.matchGroup1("v=" + ID_PATTERN, query);
-                } catch (UnsupportedEncodingException uee) {
-                    throw new ParsingException("Could not parse attribution_link", uee);
-                }
-            } else if(lowercaseUrl.contains("youtube.com/shared?ci=")) {
-                return getRealIdFromSharedLink(url);
-            } else if (url.contains("vnd.youtube")) {
-                id = Parser.matchGroup1(ID_PATTERN, url);
-            } else if (url.contains("embed")) {
-                id = Parser.matchGroup1("embed/" + ID_PATTERN, url);
-            } else if(url.contains("googleads")) {
-                throw new FoundAdException("Error found add: " + url);
-            } else {
-                id = Parser.matchGroup1("[?&]v=" + ID_PATTERN, url);
-            }
-        }
-        else if(lowercaseUrl.contains("youtu.be")) {
-            if(url.contains("v=")) {
-                id = Parser.matchGroup1("v=" + ID_PATTERN, url);
-            } else {
-                id = Parser.matchGroup1("[Yy][Oo][Uu][Tt][Uu]\\.[Bb][Ee]/" + ID_PATTERN, url);
-            }
-        }
-        else {
-            throw new ParsingException("Error no suitable url: " + url);
-        }
-
-
-        if(!id.isEmpty()){
-            return id;
-        } else {
-            throw new ParsingException("Error could not parse url: " + url);
-        }
-    }
-
-    /**
-     * Get the real url from a shared uri.
-     *
-     * Shared URI's look like this:
-     * <pre>
-     *     * https://www.youtube.com/shared?ci=PJICrTByb3E
-     *     * vnd.youtube://www.youtube.com/shared?ci=PJICrTByb3E&feature=twitter-deep-link
-     * </pre>
-     * @param url The shared url
-     * @return the id of the stream
-     * @throws ParsingException
-     */
-    private @NonNull String getRealIdFromSharedLink(String url) throws ParsingException {
-        URI uri;
-        try {
-            uri = new URI(url);
-        } catch (URISyntaxException e) {
-            throw new ParsingException("Invalid shared link", e);
-        }
-        String sharedId = getSharedId(uri);
-        Downloader downloader = NewPipe.getDownloader();
-        String content;
-        try {
-            content = downloader.download("https://www.youtube.com/shared?ci=" + sharedId);
-        } catch (IOException | ReCaptchaException e) {
-            throw new ParsingException("Unable to resolve shared link", e);
-        }
-        // is this bad? is this fragile?:
-        String realId = Parser.matchGroup1("rel=\"shortlink\" href=\"https://youtu.be/" + ID_PATTERN, content);
-        if(sharedId.equals(realId)) {
-            throw new ParsingException("Got same id for as shared id: " + sharedId);
-        }
-        return realId;
-    }
-
-    private @NonNull String getSharedId(URI uri) throws ParsingException {
-        if (!"/shared".equals(uri.getPath())) {
-            throw new ParsingException("Not a shared link: " + uri.toString() + " (path != " + uri.getPath() + ")");
-        }
-        return Parser.matchGroup1("ci=" + ID_PATTERN, uri.getQuery());
-    }
-
-    public String cleanUrl(String complexUrl) throws ParsingException {
-        return getUrl(getId(complexUrl));
-    }
-
-    @Override
-    public boolean acceptUrl(String videoUrl) {
-        videoUrl = videoUrl.toLowerCase();
-        return videoUrl.contains("youtube") ||
-                videoUrl.contains("youtu.be");
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java

@@ -1,100 +0,0 @@
-package org.schabi.newpipe.extractor.services.youtube;
-
-import org.schabi.newpipe.extractor.Downloader;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.search.SuggestionExtractor;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Created by Christian Schabesberger on 28.09.16.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * YoutubeSuggestionExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class YoutubeSuggestionExtractor extends SuggestionExtractor {
-
-    public static final String CHARSET_UTF_8 = "UTF-8";
-
-    public YoutubeSuggestionExtractor(int serviceId) {
-        super(serviceId);
-    }
-
-    @Override
-    public List<String> suggestionList(
-            String query, String contentCountry)
-            throws ExtractionException, IOException {
-        List<String> suggestions = new ArrayList<>();
-
-        Downloader dl = NewPipe.getDownloader();
-
-        String url = "https://suggestqueries.google.com/complete/search"
-                + "?client=" + ""
-                + "&output=" + "toolbar"
-                + "&ds=" + "yt"
-                + "&hl=" + URLEncoder.encode(contentCountry, CHARSET_UTF_8)
-                + "&q=" + URLEncoder.encode(query, CHARSET_UTF_8);
-
-
-        String response = dl.download(url);
-
-        //TODO: Parse xml data using Jsoup not done
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder;
-        org.w3c.dom.Document doc = null;
-
-        try {
-            dBuilder = dbFactory.newDocumentBuilder();
-            doc = dBuilder.parse(new InputSource(
-                    new ByteArrayInputStream(response.getBytes(CHARSET_UTF_8))));
-            doc.getDocumentElement().normalize();
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            throw new ParsingException("Could not parse document.");
-        }
-
-        try {
-            NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
-            for (int temp = 0; temp < nList.getLength(); temp++) {
-
-                NodeList nList1 = doc.getElementsByTagName("suggestion");
-                Node nNode1 = nList1.item(temp);
-                if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
-                    org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
-                    suggestions.add(eElement.getAttribute("data"));
-                }
-            }
-            return suggestions;
-        } catch(Exception e) {
-            throw new ParsingException("Could not get suggestions form document.", e);
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/AudioStream.java

@@ -1,46 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-/**
- * Created by Christian Schabesberger on 04.03.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * AudioStream.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class AudioStream {
-    public String url = "";
-    public int format = -1;
-    public int bandwidth = -1;
-    public int sampling_rate = -1;
-
-    public AudioStream(String url, int format, int bandwidth, int samplingRate) {
-        this.url = url; this.format = format;
-        this.bandwidth = bandwidth; this.sampling_rate = samplingRate;
-    }
-
-    // reveals whether two streams are the same, but have different urls
-    public boolean equalStats(AudioStream cmp) {
-        return format == cmp.format
-                && bandwidth == cmp.bandwidth
-                && sampling_rate == cmp.sampling_rate;
-    }
-
-    // reveals whether two streams are equal
-    public boolean equals(AudioStream cmp) {
-        return cmp != null && equalStats(cmp)
-                && url == cmp.url;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamExtractor.java

@@ -1,104 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-import java.util.List;
-
-/**Scrapes information from a video streaming service (eg, YouTube).*/
-
-
-@SuppressWarnings("ALL")
-public abstract class StreamExtractor {
-
-    private int serviceId;
-    private String url;
-    private UrlIdHandler urlIdHandler;
-    private StreamPreviewInfoCollector previewInfoCollector;
-
-    public class ExtractorInitException extends ExtractionException {
-        public ExtractorInitException(String message) {
-            super(message);
-        }
-        public ExtractorInitException(Throwable cause) {
-            super(cause);
-        }
-        public ExtractorInitException(String message, Throwable cause) {
-            super(message, cause);
-        }
-    }
-
-    public class ContentNotAvailableException extends ParsingException {
-        public ContentNotAvailableException(String message) {
-            super(message);
-        }
-        public ContentNotAvailableException(String message, Throwable cause) {
-            super(message, cause);
-        }
-    }
-
-    public StreamExtractor(UrlIdHandler urlIdHandler, String url, int serviceId) {
-        this.serviceId = serviceId;
-        this.urlIdHandler = urlIdHandler;
-        previewInfoCollector = new StreamPreviewInfoCollector(urlIdHandler, serviceId);
-    }
-
-    protected StreamPreviewInfoCollector getStreamPreviewInfoCollector() {
-        return previewInfoCollector;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public UrlIdHandler getUrlIdHandler() {
-        return urlIdHandler;
-    }
-
-    public abstract int getTimeStamp() throws ParsingException;
-    public abstract String getTitle() throws ParsingException;
-    public abstract String getDescription() throws ParsingException;
-    public abstract String getUploader() throws ParsingException;
-    public abstract String getChannelUrl() throws ParsingException;
-    public abstract int getLength() throws ParsingException;
-    public abstract long getViewCount() throws ParsingException;
-    public abstract String getUploadDate() throws ParsingException;
-    public abstract String getThumbnailUrl() throws ParsingException;
-    public abstract String getUploaderThumbnailUrl() throws ParsingException;
-    public abstract List<AudioStream> getAudioStreams() throws ParsingException;
-    public abstract List<VideoStream> getVideoStreams() throws ParsingException;
-    public abstract List<VideoStream> getVideoOnlyStreams() throws ParsingException;
-    public abstract String getDashMpdUrl() throws ParsingException;
-    public abstract int getAgeLimit() throws ParsingException;
-    public abstract String getAverageRating() throws ParsingException;
-    public abstract int getLikeCount() throws ParsingException;
-    public abstract int getDislikeCount() throws ParsingException;
-    public abstract StreamPreviewInfoExtractor getNextVideo() throws ParsingException;
-    public abstract StreamPreviewInfoCollector getRelatedVideos() throws ParsingException;
-    public abstract String getPageUrl();
-    public abstract StreamInfo.StreamType getStreamType() throws ParsingException;
-    public int getServiceId() {
-        return serviceId;
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamInfo.java

@@ -1,293 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.DashMpdParser;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**Info object for opened videos, ie the video ready to play.*/
-@SuppressWarnings("ALL")
-public class StreamInfo extends AbstractStreamInfo {
-
-    public static class StreamExctractException extends ExtractionException {
-        StreamExctractException(String message) {
-            super(message);
-        }
-    }
-
-    public StreamInfo() {}
-
-    /**Creates a new StreamInfo object from an existing AbstractVideoInfo.
-     * All the shared properties are copied to the new StreamInfo.*/
-    @SuppressWarnings("WeakerAccess")
-    public StreamInfo(AbstractStreamInfo avi) {
-        this.id = avi.id;
-        this.title = avi.title;
-        this.uploader = avi.uploader;
-        this.thumbnail_url = avi.thumbnail_url;
-        this.webpage_url = avi.webpage_url;
-        this.upload_date = avi.upload_date;
-        this.upload_date = avi.upload_date;
-        this.view_count = avi.view_count;
-
-        //todo: better than this
-        if(avi instanceof StreamPreviewInfo) {
-            //shitty String to convert code
-            /*
-            String dur = ((StreamPreviewInfo)avi).duration;
-            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
-            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
-            */
-            this.duration = ((StreamPreviewInfo)avi).duration;
-        }
-    }
-
-    public void addException(Exception e) {
-        errors.add(e);
-    }
-
-    /**Fills out the video info fields which are common to all services.
-     * Probably needs to be overridden by subclasses*/
-    public static StreamInfo getVideoInfo(StreamExtractor extractor)
-            throws ExtractionException, IOException {
-        StreamInfo streamInfo = new StreamInfo();
-
-        streamInfo = extractImportantData(streamInfo, extractor);
-        streamInfo = extractStreams(streamInfo, extractor);
-        streamInfo = extractOptionalData(streamInfo, extractor);
-
-        return streamInfo;
-    }
-
-    private static StreamInfo extractImportantData(
-            StreamInfo streamInfo, StreamExtractor extractor)
-            throws ExtractionException, IOException {
-        /* ---- important data, withoug the video can't be displayed goes here: ---- */
-        // if one of these is not available an exception is meant to be thrown directly into the frontend.
-
-        UrlIdHandler uiconv = extractor.getUrlIdHandler();
-
-        streamInfo.service_id = extractor.getServiceId();
-        streamInfo.webpage_url = extractor.getPageUrl();
-        streamInfo.stream_type = extractor.getStreamType();
-        streamInfo.id = uiconv.getId(extractor.getPageUrl());
-        streamInfo.title = extractor.getTitle();
-        streamInfo.age_limit = extractor.getAgeLimit();
-
-        if((streamInfo.stream_type == StreamType.NONE)
-                || (streamInfo.webpage_url == null || streamInfo.webpage_url.isEmpty())
-                || (streamInfo.id == null || streamInfo.id.isEmpty())
-                || (streamInfo.title == null /* streamInfo.title can be empty of course */)
-                || (streamInfo.age_limit == -1)) {
-            throw new ExtractionException("Some importand stream information was not given.");
-        }
-
-        return streamInfo;
-    }
-
-    private static StreamInfo extractStreams(
-            StreamInfo streamInfo, StreamExtractor extractor)
-            throws ExtractionException, IOException {
-        /* ---- stream extraction goes here ---- */
-        // At least one type of stream has to be available,
-        // otherwise an exception will be thrown directly into the frontend.
-
-        try {
-            streamInfo.dashMpdUrl = extractor.getDashMpdUrl();
-        } catch(Exception e) {
-            streamInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
-        }
-
-        /*  Load and extract audio */
-        try {
-            streamInfo.audio_streams = extractor.getAudioStreams();
-        } catch(Exception e) {
-            streamInfo.addException(new ExtractionException("Couldn't get audio streams", e));
-        }
-        // also try to get streams from the dashMpd
-        if(streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
-            if(streamInfo.audio_streams == null) {
-                streamInfo.audio_streams = new Vector<>();
-            }
-            //todo: make this quick and dirty solution a real fallback
-            // same as the quick and dirty above
-            try {
-                streamInfo.audio_streams.addAll(
-                        DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl));
-            } catch(Exception e) {
-                streamInfo.addException(
-                        new ExtractionException("Couldn't get audio streams from dash mpd", e));
-            }
-        }
-        /* Extract video stream url*/
-        try {
-            streamInfo.video_streams = extractor.getVideoStreams();
-        } catch (Exception e) {
-            streamInfo.addException(
-                    new ExtractionException("Couldn't get video streams", e));
-        }
-        /* Extract video only stream url*/
-        try {
-            streamInfo.video_only_streams = extractor.getVideoOnlyStreams();
-        } catch(Exception e) {
-            streamInfo.addException(
-                    new ExtractionException("Couldn't get video only streams", e));
-        }
-
-        // either dash_mpd audio_only or video has to be available, otherwise we didn't get a stream,
-        // and therefore failed. (Since video_only_streams are just optional they don't caunt).
-        if((streamInfo.video_streams == null || streamInfo.video_streams.isEmpty())
-                && (streamInfo.audio_streams == null || streamInfo.audio_streams.isEmpty())
-                && (streamInfo.dashMpdUrl == null || streamInfo.dashMpdUrl.isEmpty())) {
-            throw new StreamExctractException(
-                    "Could not get any stream. See error variable to get further details.");
-        }
-
-        return streamInfo;
-    }
-
-    private static StreamInfo extractOptionalData(
-            StreamInfo streamInfo, StreamExtractor extractor) {
-        /*  ---- optional data goes here: ---- */
-        // If one of these fails, the frontend needs to handle that they are not available.
-        // Exceptions are therefore not thrown into the frontend, but stored into the error List,
-        // so the frontend can afterwards check where errors happened.
-
-        try {
-            streamInfo.thumbnail_url = extractor.getThumbnailUrl();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.duration = extractor.getLength();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.uploader = extractor.getUploader();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.channel_url = extractor.getChannelUrl();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.description = extractor.getDescription();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.view_count = extractor.getViewCount();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.upload_date = extractor.getUploadDate();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.start_position = extractor.getTimeStamp();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.average_rating = extractor.getAverageRating();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.like_count = extractor.getLikeCount();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            streamInfo.dislike_count = extractor.getDislikeCount();
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            // get next video
-            if(streamInfo.next_video != null)
-            {
-                StreamPreviewInfoCollector c = new StreamPreviewInfoCollector(
-                        extractor.getUrlIdHandler(), extractor.getServiceId());
-                StreamPreviewInfoExtractor nextVideo = extractor.getNextVideo();
-                c.commit(nextVideo);
-                if(c.getItemList().size() != 0) {
-                    streamInfo.next_video = c.getItemList().get(0);
-                }
-                streamInfo.errors.addAll(c.getErrors());
-            }
-        }
-        catch(Exception e) {
-            streamInfo.addException(e);
-        }
-        try {
-            // get related videos
-            StreamPreviewInfoCollector c = extractor.getRelatedVideos();
-            streamInfo.related_streams = c.getItemList();
-            streamInfo.errors.addAll(c.getErrors());
-        } catch(Exception e) {
-            streamInfo.addException(e);
-        }
-
-        return streamInfo;
-    }
-
-    public String uploader_thumbnail_url = "";
-    public String channel_url = "";
-    public String description = "";
-
-    public List<VideoStream> video_streams = null;
-    public List<AudioStream> audio_streams = null;
-    public List<VideoStream> video_only_streams = null;
-    // video streams provided by the dash mpd do not need to be provided as VideoStream.
-    // Later on this will also aplly to audio streams. Since dash mpd is standarized,
-    // crawling such a file is not service dependent. Therefore getting audio only streams by yust
-    // providing the dash mpd fille will be possible in the future.
-    public String dashMpdUrl = "";
-    public int duration = -1;
-
-    public int age_limit = -1;
-    public int like_count = -1;
-    public int dislike_count = -1;
-    public String average_rating = "";
-    public StreamPreviewInfo next_video = null;
-    public List<StreamPreviewInfo> related_streams = null;
-    //in seconds. some metadata is not passed using a StreamInfo object!
-    public int start_position = 0;
-
-    public List<Throwable> errors = new Vector<>();
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfo.java

@@ -1,28 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamPreviewInfo.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-
-/**Info object for previews of unopened videos, eg search results, related videos*/
-public class StreamPreviewInfo extends AbstractStreamInfo {
-    public int duration;
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java

@@ -1,102 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.UrlIdHandler;
-import org.schabi.newpipe.extractor.exceptions.FoundAdException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
-
-import java.util.List;
-import java.util.Vector;
-
-/**
- * Created by Christian Schabesberger on 28.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamPreviewInfoCollector.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class StreamPreviewInfoCollector {
-    private List<StreamPreviewInfo> itemList = new Vector<>();
-    private List<Throwable> errors = new Vector<>();
-    private UrlIdHandler urlIdHandler;
-    private int serviceId = -1;
-
-    public StreamPreviewInfoCollector(UrlIdHandler handler, int serviceId) {
-        urlIdHandler = handler;
-        this.serviceId = serviceId;
-    }
-
-    public List<StreamPreviewInfo> getItemList() {
-        return itemList;
-    }
-
-    public List<Throwable> getErrors() {
-        return errors;
-    }
-
-    public void addError(Exception e) {
-        errors.add(e);
-    }
-
-    public void commit(StreamPreviewInfoExtractor extractor) throws ParsingException {
-        try {
-            StreamPreviewInfo resultItem = new StreamPreviewInfo();
-            // importand information
-            resultItem.service_id = serviceId;
-            resultItem.webpage_url = extractor.getWebPageUrl();
-            if (urlIdHandler == null) {
-                throw new ParsingException("Error: UrlIdHandler not set");
-            } else if(!resultItem.webpage_url.isEmpty()) {
-                resultItem.id = NewPipe.getService(serviceId).getUrlIdHandlerInstance().getId(resultItem.webpage_url);
-            }
-            resultItem.title = extractor.getTitle();
-            resultItem.stream_type = extractor.getStreamType();
-
-            // optional information
-            try {
-                resultItem.duration = extractor.getDuration();
-            } catch (Exception e) {
-                addError(e);
-            }
-            try {
-                resultItem.uploader = extractor.getUploader();
-            } catch (Exception e) {
-                addError(e);
-            }
-            try {
-                resultItem.upload_date = extractor.getUploadDate();
-            } catch (Exception e) {
-                addError(e);
-            }
-            try {
-                resultItem.view_count = extractor.getViewCount();
-            } catch (Exception e) {
-                addError(e);
-            }
-            try {
-                resultItem.thumbnail_url = extractor.getThumbnailUrl();
-            } catch (Exception e) {
-                addError(e);
-            }
-            itemList.add(resultItem);
-        } catch(FoundAdException ae) {
-            System.out.println("AD_WARNING: " + ae.getMessage());
-        } catch (Exception e) {
-            addError(e);
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoExtractor.java

@@ -1,35 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-
-/**
- * Created by Christian Schabesberger on 28.02.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamPreviewInfoExtractor.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public interface StreamPreviewInfoExtractor {
-    AbstractStreamInfo.StreamType getStreamType() throws ParsingException;
-    String getWebPageUrl() throws ParsingException;
-    String getTitle() throws ParsingException;
-    int getDuration() throws ParsingException;
-    String getUploader() throws ParsingException;
-    String getUploadDate() throws ParsingException;
-    long getViewCount() throws  ParsingException;
-    String getThumbnailUrl() throws  ParsingException;
-}

app/src/main/java/org/schabi/newpipe/extractor/stream_info/VideoStream.java

@@ -1,44 +0,0 @@
-package org.schabi.newpipe.extractor.stream_info;
-
-/**
- * Created by Christian Schabesberger on 04.03.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * VideoStream.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoStream {
-    //url of the stream
-    public String url = "";
-    public int format = -1;
-    public String resolution = "";
-
-    public VideoStream(String url, int format, String res) {
-        this.url = url; this.format = format; resolution = res;
-    }
-
-    // reveals wether two streams are the same, but have diferent urls
-    public boolean equalStats(VideoStream cmp) {
-        return format == cmp.format
-                && resolution == cmp.resolution;
-    }
-
-    // revelas wether two streams are equal
-    public boolean equals(VideoStream cmp) {
-        return cmp != null && equalStats(cmp)
-                && url == cmp.url;
-    }
-}

app/src/main/java/org/schabi/newpipe/info_list/ChannelInfoItemHolder.java

@@ -0,0 +1,54 @@
+package org.schabi.newpipe.info_list;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+/**
+ * Created by Christian Schabesberger on 12.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ChannelInfoItemHolder .java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class ChannelInfoItemHolder extends InfoItemHolder {
+    public final CircleImageView itemThumbnailView;
+    public final TextView itemChannelTitleView;
+    public final TextView itemSubscriberCountView;
+    public final TextView itemVideoCountView;
+    public final TextView itemChannelDescriptionView;
+    public final Button itemButton;
+
+    ChannelInfoItemHolder(View v) {
+        super(v);
+        itemThumbnailView = (CircleImageView) v.findViewById(R.id.itemThumbnailView);
+        itemChannelTitleView = (TextView) v.findViewById(R.id.itemChannelTitleView);
+        itemSubscriberCountView = (TextView) v.findViewById(R.id.itemSubscriberCountView);
+        itemVideoCountView = (TextView) v.findViewById(R.id.itemVideoCountView);
+        itemChannelDescriptionView = (TextView) v.findViewById(R.id.itemChannelDescriptionView);
+        itemButton = (Button) v.findViewById(R.id.item_button);
+    }
+
+    @Override
+    public InfoItem.InfoType infoType() {
+        return InfoItem.InfoType.CHANNEL;
+    }
+}

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java

@@ -1,9 +1,11 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -11,7 +13,9 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import org.schabi.newpipe.ImageErrorLoadingListener;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.AbstractStreamInfo;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
 
 /**
  * Created by Christian Schabesberger on 26.09.16.
@@ -35,8 +39,17 @@ import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
 
 public class InfoItemBuilder {
 
-    public interface OnItemSelectedListener {
-        void selected(String url);
+    final String viewsS;
+    final String videosS;
+    final String subsS;
+
+    final String thousand;
+    final String million;
+    final String billion;
+
+    private static final String TAG = InfoItemBuilder.class.toString();
+    public interface OnInfoItemSelectedListener {
+        void selected(String url, int serviceId);
     }
 
     private Activity activity = null;
@@ -44,18 +57,75 @@ public class InfoItemBuilder {
     private ImageLoader imageLoader = ImageLoader.getInstance();
     private DisplayImageOptions displayImageOptions =
             new DisplayImageOptions.Builder().cacheInMemory(true).build();
-    private OnItemSelectedListener onItemSelectedListener;
+    private OnInfoItemSelectedListener onStreamInfoItemSelectedListener;
+    private OnInfoItemSelectedListener onChannelInfoItemSelectedListener;
 
     public InfoItemBuilder(Activity a, View rootView) {
         activity = a;
         this.rootView = rootView;
+        viewsS = a.getString(R.string.views);
+        videosS = a.getString(R.string.videos);
+        subsS = a.getString(R.string.subscriber);
+        thousand = a.getString(R.string.short_thousand);
+        million = a.getString(R.string.short_million);
+        billion = a.getString(R.string.short_billion);
     }
 
-    public void setOnItemSelectedListener(OnItemSelectedListener onItemSelectedListener) {
-        this.onItemSelectedListener = onItemSelectedListener;
+    public void setOnStreamInfoItemSelectedListener(
+            OnInfoItemSelectedListener listener) {
+        this.onStreamInfoItemSelectedListener = listener;
     }
 
-    public void buildByHolder(InfoItemHolder holder, final StreamPreviewInfo info) {
+    public void setOnChannelInfoItemSelectedListener(
+            OnInfoItemSelectedListener listener) {
+        this.onChannelInfoItemSelectedListener = listener;
+    }
+
+    public void buildByHolder(InfoItemHolder holder, final InfoItem i) {
+        if(i.infoType() != holder.infoType())
+            return;
+        switch(i.infoType()) {
+            case STREAM:
+                buildStreamInfoItem((StreamInfoItemHolder) holder, (StreamInfoItem) i);
+                break;
+            case CHANNEL:
+                buildChannelInfoItem((ChannelInfoItemHolder) holder, (ChannelInfoItem) i);
+                break;
+            case PLAYLIST:
+                Log.e(TAG, "Not yet implemented");
+                break;
+            default:
+                Log.e(TAG, "Trollolo");
+        }
+    }
+
+    public View buildView(ViewGroup parent, final InfoItem info) {
+        View itemView = null;
+        InfoItemHolder holder = null;
+        switch(info.infoType()) {
+            case STREAM:
+                itemView = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.stream_item, parent, false);
+                holder = new StreamInfoItemHolder(itemView);
+                break;
+            case CHANNEL:
+                itemView = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.channel_item, parent, false);
+                holder = new ChannelInfoItemHolder(itemView);
+                break;
+            case PLAYLIST:
+                Log.e(TAG, "Not yet implemented");
+            default:
+                Log.e(TAG, "Trollolo");
+        }
+        buildByHolder(holder, info);
+        return itemView;
+    }
+
+    private void buildStreamInfoItem(StreamInfoItemHolder holder, final StreamInfoItem info) {
+        if(info.infoType() != InfoItem.InfoType.STREAM) {
+            Log.e("InfoItemBuilder", "Info type not yet supported");
+        }
         // fill holder with information
         holder.itemVideoTitleView.setText(info.title);
         if(info.uploader != null && !info.uploader.isEmpty()) {
@@ -92,29 +162,55 @@ public class InfoItemBuilder {
         holder.itemButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                onItemSelectedListener.selected(info.webpage_url);
+                onStreamInfoItemSelectedListener.selected(info.webpage_url, info.service_id);
             }
         });
     }
 
-    public View buildView(ViewGroup parent, final StreamPreviewInfo info) {
-        View streamPreviewView = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.video_item, parent, false);
-        InfoItemHolder holder = new InfoItemHolder(streamPreviewView);
-        buildByHolder(holder, info);
-        return streamPreviewView;
+    private void buildChannelInfoItem(ChannelInfoItemHolder holder, final ChannelInfoItem info) {
+        holder.itemChannelTitleView.setText(info.getTitle());
+        holder.itemSubscriberCountView.setText(shortSubscriber(info.subscriberCount) + " • ");
+        holder.itemVideoCountView.setText(info.videoAmount + " " + videosS);
+        holder.itemChannelDescriptionView.setText(info.description);
+
+        holder.itemThumbnailView.setImageResource(R.drawable.buddy_channel_item);
+        if(info.thumbnailUrl != null && !info.thumbnailUrl.isEmpty()) {
+            imageLoader.displayImage(info.thumbnailUrl,
+                    holder.itemThumbnailView,
+                    displayImageOptions,
+                    new ImageErrorLoadingListener(activity, rootView, info.serviceId));
+        }
+
+        holder.itemButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onChannelInfoItemSelectedListener.selected(info.getLink(), info.serviceId);
+            }
+        });
     }
 
 
-    public static String shortViewCount(Long viewCount){
+    public String shortViewCount(Long viewCount){
         if(viewCount >= 1000000000){
-            return Long.toString(viewCount/1000000000)+"B views";
+            return Long.toString(viewCount/1000000000)+ billion + " " + viewsS;
         }else if(viewCount>=1000000){
-            return Long.toString(viewCount/1000000)+"M views";
+            return Long.toString(viewCount/1000000)+ million + " " + viewsS;
         }else if(viewCount>=1000){
-            return Long.toString(viewCount/1000)+"K views";
+            return Long.toString(viewCount/1000)+ thousand + " " + viewsS;
         }else {
-            return Long.toString(viewCount)+" views";
+            return Long.toString(viewCount)+ " " + viewsS;
+        }
+    }
+
+    public String shortSubscriber(Long count){
+        if(count >= 1000000000){
+            return Long.toString(count/1000000000)+ billion + " " + subsS;
+        }else if(count>=1000000){
+            return Long.toString(count/1000000)+ million + " " + subsS;
+        }else if(count>=1000){
+            return Long.toString(count/1000)+ thousand + " " + subsS;
+        }else {
+            return Long.toString(count)+ " " + subsS;
         }
     }
 

app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java

@@ -2,14 +2,11 @@ package org.schabi.newpipe.info_list;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
 
 /**
- * Created by Christian Schabesberger on 01.08.16.
+ * Created by Christian Schabesberger on 12.02.17.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * InfoItemHolder.java is part of NewPipe.
@@ -28,25 +25,9 @@ import org.schabi.newpipe.R;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class InfoItemHolder extends RecyclerView.ViewHolder {
-
-    public final ImageView itemThumbnailView;
-    public final TextView itemVideoTitleView,
-            itemUploaderView,
-            itemDurationView,
-            itemUploadDateView,
-            itemViewCountView;
-    public final Button itemButton;
-
+public abstract class InfoItemHolder extends RecyclerView.ViewHolder {
     public InfoItemHolder(View v) {
         super(v);
-        itemThumbnailView = (ImageView) v.findViewById(R.id.itemThumbnailView);
-        itemVideoTitleView = (TextView) v.findViewById(R.id.itemVideoTitleView);
-        itemUploaderView = (TextView) v.findViewById(R.id.itemUploaderView);
-        itemDurationView = (TextView) v.findViewById(R.id.itemDurationView);
-        itemUploadDateView = (TextView) v.findViewById(R.id.itemUploadDateView);
-        itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
-        itemButton = (Button) v.findViewById(R.id.item_button);
     }
-
+    public abstract InfoItem.InfoType infoType();
 }

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -2,12 +2,13 @@ package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
+import org.schabi.newpipe.extractor.InfoItem;
 
 import java.util.List;
 import java.util.Vector;
@@ -32,48 +33,131 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class InfoListAdapter extends RecyclerView.Adapter<InfoItemHolder> {
+public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private static final String TAG = InfoListAdapter.class.toString();
 
     private final InfoItemBuilder infoItemBuilder;
-    private final List<StreamPreviewInfo> streamList;
+    private final List<InfoItem> infoItemList;
+    private boolean showFooter = false;
+    private View header = null;
+    private View footer = null;
+
+    public class HFHolder extends RecyclerView.ViewHolder {
+        public HFHolder(View v) {
+            super(v);
+            view = v;
+        }
+        public View view;
+    }
+
+    public void showFooter(boolean show) {
+        showFooter = show;
+        notifyDataSetChanged();
+    }
 
     public InfoListAdapter(Activity a, View rootView) {
         infoItemBuilder = new InfoItemBuilder(a, rootView);
-        streamList = new Vector<>();
+        infoItemList = new Vector<>();
     }
 
-    public void setOnItemSelectedListener
-            (InfoItemBuilder.OnItemSelectedListener onItemSelectedListener) {
-        infoItemBuilder.setOnItemSelectedListener(onItemSelectedListener);
+    public void setOnStreamInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(listener);
     }
 
-    public void addStreamItemList(List<StreamPreviewInfo> videos) {
-        if(videos!= null) {
-            streamList.addAll(videos);
+    public void setOnChannelInfoItemSelectedListener
+            (InfoItemBuilder.OnInfoItemSelectedListener listener) {
+        infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
+    }
+
+    public void addInfoItemList(List<InfoItem> data) {
+        if(data != null) {
+            infoItemList.addAll(data);
             notifyDataSetChanged();
         }
     }
 
     public void clearSteamItemList() {
-        streamList.clear();
+        infoItemList.clear();
+        notifyDataSetChanged();
+    }
+
+    public void setHeader(View header) {
+        this.header = header;
+        notifyDataSetChanged();
+    }
+
+    public void setFooter(View view) {
+        this.footer = view;
         notifyDataSetChanged();
     }
 
     @Override
     public int getItemCount() {
-        return streamList.size();
+        int cound = infoItemList.size();
+        if(header != null) cound++;
+        if(footer != null && showFooter) cound++;
+        return cound;
+    }
+
+    // don't ask why we have to do that this way... it's android accept it -.-
+    @Override
+    public int getItemViewType(int position) {
+        if(header != null && position == 0) {
+            return 0;
+        } else if(header != null) {
+            position--;
+        }
+        if(footer != null && position == infoItemList.size() && showFooter) {
+            return 1;
+        }
+        switch(infoItemList.get(position).infoType()) {
+            case STREAM:
+                return 2;
+            case CHANNEL:
+                return 3;
+            case PLAYLIST:
+                return 4;
+            default:
+                Log.e(TAG, "Trollolo");
+                return -1;
+        }
     }
 
     @Override
-    public InfoItemHolder onCreateViewHolder(ViewGroup parent, int i) {
-        View itemView = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.video_item, parent, false);
-
-        return new InfoItemHolder(itemView);
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
+        switch(type) {
+            case 0:
+                return new HFHolder(header);
+            case 1:
+                return new HFHolder(footer);
+            case 2:
+                return new StreamInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.stream_item, parent, false));
+            case 3:
+                return new ChannelInfoItemHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.channel_item, parent, false));
+            case 4:
+                Log.e(TAG, "Playlist is not yet implemented");
+                return null;
+            default:
+                Log.e(TAG, "Trollolo");
+                return null;
+        }
     }
 
     @Override
-    public void onBindViewHolder(InfoItemHolder holder, int i) {
-        infoItemBuilder.buildByHolder(holder, streamList.get(i));
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int i) {
+        //god damen f*** ANDROID SH**
+        if(holder instanceof InfoItemHolder) {
+            if(header != null) {
+                i--;
+            }
+            infoItemBuilder.buildByHolder((InfoItemHolder) holder, infoItemList.get(i));
+        } else if(holder instanceof HFHolder && i == 0 && header != null) {
+            ((HFHolder) holder).view = header;
+        } else if(holder instanceof HFHolder && i == infoItemList.size() && footer != null && showFooter) {
+            ((HFHolder) holder).view = footer;
+        }
     }
 }

app/src/main/java/org/schabi/newpipe/info_list/StreamInfoItemHolder.java

@@ -0,0 +1,58 @@
+package org.schabi.newpipe.info_list;
+
+import android.icu.text.IDNA;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.InfoItem;
+
+/**
+ * Created by Christian Schabesberger on 01.08.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfoItemHolder.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class StreamInfoItemHolder extends InfoItemHolder {
+
+    public final ImageView itemThumbnailView;
+    public final TextView itemVideoTitleView,
+            itemUploaderView,
+            itemDurationView,
+            itemUploadDateView,
+            itemViewCountView;
+    public final Button itemButton;
+
+    public StreamInfoItemHolder(View v) {
+        super(v);
+        itemThumbnailView = (ImageView) v.findViewById(R.id.itemThumbnailView);
+        itemVideoTitleView = (TextView) v.findViewById(R.id.itemVideoTitleView);
+        itemUploaderView = (TextView) v.findViewById(R.id.itemUploaderView);
+        itemDurationView = (TextView) v.findViewById(R.id.itemDurationView);
+        itemUploadDateView = (TextView) v.findViewById(R.id.itemUploadDateView);
+        itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
+        itemButton = (Button) v.findViewById(R.id.item_button);
+    }
+
+    @Override
+    public InfoItem.InfoType infoType() {
+        return InfoItem.InfoType.STREAM;
+    }
+}

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

@@ -27,6 +27,7 @@ import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.util.NavStack;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -355,8 +356,8 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             //build intent to return to video, on tapping notification
             Intent openDetailViewIntent = new Intent(getApplicationContext(),
                     VideoItemDetailActivity.class);
-            openDetailViewIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
-            openDetailViewIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
+            openDetailViewIntent.putExtra(NavStack.SERVICE_ID, serviceId);
+            openDetailViewIntent.putExtra(NavStack.URL, webUrl);
             openDetailViewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             PendingIntent openDetailView = PendingIntent.getActivity(owner, noteID,
                     openDetailViewIntent, PendingIntent.FLAG_UPDATE_CURRENT);

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

@@ -1,5 +1,3 @@
-
-
 package org.schabi.newpipe.report;
 
 import android.app.Activity;
@@ -8,14 +6,15 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.os.Bundle;
-import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -34,8 +33,8 @@ import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.ThemableActivity;
 import org.schabi.newpipe.extractor.Parser;
+import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -65,65 +64,12 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ErrorActivity extends ThemableActivity {
-    public static class ErrorInfo implements Parcelable {
-        public int userAction;
-        public String request;
-        public String serviceName;
-        public int message;
-
-        public static ErrorInfo make(int userAction, String serviceName, String request, int message) {
-            ErrorInfo info = new ErrorInfo();
-            info.userAction = userAction;
-            info.serviceName = serviceName;
-            info.request = request;
-            info.message = message;
-            return info;
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(this.userAction);
-            dest.writeString(this.request);
-            dest.writeString(this.serviceName);
-            dest.writeInt(this.message);
-        }
-
-        public ErrorInfo() {
-        }
-
-        protected ErrorInfo(Parcel in) {
-            this.userAction = in.readInt();
-            this.request = in.readString();
-            this.serviceName = in.readString();
-            this.message = in.readInt();
-        }
-
-        public static final Parcelable.Creator<ErrorInfo> CREATOR = new Parcelable.Creator<ErrorInfo>() {
-            @Override
-            public ErrorInfo createFromParcel(Parcel source) {
-                return new ErrorInfo(source);
-            }
-
-            @Override
-            public ErrorInfo[] newArray(int size) {
-                return new ErrorInfo[size];
-            }
-        };
-    }
-
+public class ErrorActivity extends AppCompatActivity {
     // LOG TAGS
     public static final String TAG = ErrorActivity.class.toString();
-
     // BUNDLE TAGS
     public static final String ERROR_INFO = "error_info";
     public static final String ERROR_LIST = "error_list";
-
     // MESSAGE ID
     public static final int SEARCHED = 0;
     public static final int REQUESTED_STREAM = 1;
@@ -133,7 +79,6 @@ public class ErrorActivity extends ThemableActivity {
     public static final int LOAD_IMAGE = 5;
     public static final int UI_ERROR = 6;
     public static final int REQUESTED_CHANNEL = 7;
-
     // MESSAGE STRING
     public static final String SEARCHED_STRING = "searched";
     public static final String REQUESTED_STREAM_STRING = "requested stream";
@@ -143,17 +88,14 @@ public class ErrorActivity extends ThemableActivity {
     public static final String LOAD_IMAGE_STRING = "load image";
     public static final String UI_ERROR_STRING = "ui error";
     public static final String REQUESTED_CHANNEL_STRING = "requested channel";
-
     public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
-
+    Thread globIpRangeThread;
     private String[] errorList;
     private ErrorInfo errorInfo;
     private Class returnActivity;
     private String currentTimeStamp;
     private String globIpRange;
-    Thread globIpRangeThread;
-
     // views
     private TextView errorView;
     private EditText userCommentBox;
@@ -161,6 +103,10 @@ public class ErrorActivity extends ThemableActivity {
     private TextView infoView;
     private TextView errorMessageView;
 
+    public static void reportUiError(final AppCompatActivity activity, final Throwable el) {
+        reportError(activity, el, activity.getClass(), null, ErrorInfo.make(UI_ERROR, "none", "", R.string.app_ui_crash));
+    }
+
     public static void reportError(final Context context, final List<Throwable> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
 
@@ -238,9 +184,26 @@ public class ErrorActivity extends ThemableActivity {
         context.startActivity(intent);
     }
 
+    private static String getStackTrace(final Throwable throwable) {
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw, true);
+        throwable.printStackTrace(pw);
+        return sw.getBuffer().toString();
+    }
+
+    // errorList to StringList
+    private static String[] elToSl(List<Throwable> stackTraces) {
+        String[] out = new String[stackTraces.size()];
+        for (int i = 0; i < stackTraces.size(); i++) {
+            out[i] = getStackTrace(stackTraces.get(i));
+        }
+        return out;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_error);
 
         Intent intent = getIntent();
@@ -297,6 +260,11 @@ public class ErrorActivity extends ThemableActivity {
         }
 
         errorView.setText(formErrorText(errorList));
+
+        //print stack trace once again for debugging:
+        for(String e : errorList) {
+            Log.e(TAG, e);
+        }
     }
 
     @Override
@@ -325,13 +293,6 @@ public class ErrorActivity extends ThemableActivity {
         return false;
     }
 
-    private static String getStackTrace(final Throwable throwable) {
-        final StringWriter sw = new StringWriter();
-        final PrintWriter pw = new PrintWriter(sw, true);
-        throwable.printStackTrace(pw);
-        return sw.getBuffer().toString();
-    }
-
     private String formErrorText(String[] el) {
         String text = "";
         if(el != null) {
@@ -468,6 +429,56 @@ public class ErrorActivity extends ThemableActivity {
         return df.format(new Date());
     }
 
+    public static class ErrorInfo implements Parcelable {
+        public static final Parcelable.Creator<ErrorInfo> CREATOR = new Parcelable.Creator<ErrorInfo>() {
+            @Override
+            public ErrorInfo createFromParcel(Parcel source) {
+                return new ErrorInfo(source);
+            }
+
+            @Override
+            public ErrorInfo[] newArray(int size) {
+                return new ErrorInfo[size];
+            }
+        };
+        public int userAction;
+        public String request;
+        public String serviceName;
+        public int message;
+
+        public ErrorInfo() {
+        }
+
+        protected ErrorInfo(Parcel in) {
+            this.userAction = in.readInt();
+            this.request = in.readString();
+            this.serviceName = in.readString();
+            this.message = in.readInt();
+        }
+
+        public static ErrorInfo make(int userAction, String serviceName, String request, int message) {
+            ErrorInfo info = new ErrorInfo();
+            info.userAction = userAction;
+            info.serviceName = serviceName;
+            info.request = request;
+            info.message = message;
+            return info;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.userAction);
+            dest.writeString(this.request);
+            dest.writeString(this.serviceName);
+            dest.writeInt(this.message);
+        }
+    }
+
     private class IpRagneRequester implements Runnable {
         Handler h = new Handler();
         public void run() {
@@ -487,8 +498,6 @@ public class ErrorActivity extends ThemableActivity {
         }
     }
 
-
-
     private class IpRageReturnRunnable implements Runnable {
         String ipRange;
         public IpRageReturnRunnable(String ipRange) {
@@ -504,13 +513,4 @@ public class ErrorActivity extends ThemableActivity {
             }
         }
     }
-
-    // errorList to StringList
-    private static String[] elToSl(List<Throwable> stackTraces) {
-        String[] out = new String[stackTraces.size()];
-        for(int i = 0; i < stackTraces.size(); i++) {
-            out[i] = getStackTrace(stackTraces.get(i));
-        }
-        return out;
-    }
 }

app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java

@@ -19,8 +19,10 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import org.schabi.newpipe.ChannelActivity;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -28,6 +30,9 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.util.NavStack;
+
+import java.util.EnumSet;
 
 import static android.app.Activity.RESULT_OK;
 import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
@@ -56,6 +61,9 @@ public class SearchInfoItemFragment extends Fragment {
 
     private static final String TAG = SearchInfoItemFragment.class.toString();
 
+    private EnumSet<SearchEngine.Filter> filter =
+            EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
+
     /**
      * Listener for search queries
      */
@@ -166,7 +174,7 @@ public class SearchInfoItemFragment extends Fragment {
         sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
             @Override
             public void onResult(SearchResult result) {
-                infoListAdapter.addStreamItemList(result.resultList);
+                infoListAdapter.addInfoItemList(result.resultList);
                 setDoneLoading();
             }
 
@@ -197,7 +205,6 @@ public class SearchInfoItemFragment extends Fragment {
                         RECAPTCHA_REQUEST);
             }
         });
-
     }
 
     @Override
@@ -213,10 +220,21 @@ public class SearchInfoItemFragment extends Fragment {
 
         infoListAdapter = new InfoListAdapter(getActivity(),
                 getActivity().findViewById(android.R.id.content));
-        infoListAdapter.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
+        infoListAdapter.setFooter(inflater.inflate(R.layout.pignate_footer, recyclerView, false));
+        infoListAdapter.showFooter(false);
+        infoListAdapter.setOnStreamInfoItemSelectedListener(
+                new InfoItemBuilder.OnInfoItemSelectedListener() {
             @Override
-            public void selected(String url) {
-                startDetailActivity(url);
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                    .openDetailActivity(getContext(), url, serviceId);
+            }
+        });
+        infoListAdapter.setOnChannelInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance()
+                        .openChannelActivity(getContext(), url, serviceId);
             }
         });
         recyclerView.setAdapter(infoListAdapter);
@@ -243,13 +261,6 @@ public class SearchInfoItemFragment extends Fragment {
         return view;
     }
 
-    private void startDetailActivity(String url) {
-        Intent i = new Intent(getActivity(), VideoItemDetailActivity.class);
-        i.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-        i.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
-        getActivity().startActivity(i);
-    }
-
     @Override
     public void onStart() {
         super.onStart();
@@ -275,6 +286,32 @@ public class SearchInfoItemFragment extends Fragment {
         setupSearchView(searchView);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+            case R.id.menu_filter_all:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL));
+                return true;
+            case R.id.menu_filter_video:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM));
+                return true;
+            case R.id.menu_filter_channel:
+                changeFilter(item, EnumSet.of(SearchEngine.Filter.CHANNEL));
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private void changeFilter(MenuItem item, EnumSet<SearchEngine.Filter> filter) {
+        this.filter = filter;
+        item.setChecked(true);
+        if(searchQuery != null && !searchQuery.isEmpty()) {
+            Log.d(TAG, "Fuck+ " + searchQuery);
+            search(searchQuery);
+        }
+    }
+
     private void setupSearchView(SearchView searchView) {
         suggestionListAdapter = new SuggestionListAdapter(getActivity());
         searchView.setSuggestionsAdapter(suggestionListAdapter);
@@ -288,6 +325,7 @@ public class SearchInfoItemFragment extends Fragment {
 
     private void search(String query) {
         infoListAdapter.clearSteamItemList();
+        infoListAdapter.showFooter(false);
         pageNumber = 0;
         searchQuery = query;
         search(query, pageNumber);
@@ -298,12 +336,17 @@ public class SearchInfoItemFragment extends Fragment {
     private void search(String query, int page) {
         isLoading = true;
         SearchWorker sw = SearchWorker.getInstance();
-        sw.search(streamingServiceId, query, page, getActivity());
+        sw.search(streamingServiceId,
+                query,
+                page,
+                getActivity(),
+                filter);
     }
 
     private void setDoneLoading() {
         this.isLoading = false;
         loadingIndicator.setVisibility(View.GONE);
+        infoListAdapter.showFooter(true);
     }
 
     /**

app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java

@@ -16,6 +16,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
 
 import java.io.IOException;
+import java.util.EnumSet;
 
 /**
  * Created by Christian Schabesberger on 02.08.16.
@@ -67,14 +68,21 @@ public class SearchWorker {
         public static final String YOUTUBE = "Youtube";
         private final String query;
         private final int page;
+        private final EnumSet<SearchEngine.Filter> filter;
         final Handler h = new Handler();
         private volatile boolean runs = true;
         private Activity a = null;
         private int serviceId = -1;
-        public SearchRunnable(int serviceId, String query, int page, Activity activity, int requestId) {
+        public SearchRunnable(int serviceId,
+                              String query,
+                              int page,
+                              EnumSet<SearchEngine.Filter> filter,
+                              Activity activity,
+                              int requestId) {
             this.serviceId = serviceId;
             this.query = query;
             this.page = page;
+            this.filter = filter;
             this.a = activity;
         }
         void terminate() {
@@ -102,13 +110,14 @@ public class SearchWorker {
                 String searchLanguage = sp.getString(searchLanguageKey,
                         a.getString(R.string.default_language_value));
                 result = SearchResult
-                        .getSearchResult(engine, query, page, searchLanguage);
+                        .getSearchResult(engine, query, page, searchLanguage, filter);
                 if(runs) {
                     h.post(new ResultRunnable(result, requestId));
                 }
 
                 // look for errors during extraction
                 // soft errors:
+                View rootView = a.findViewById(android.R.id.content);
                 if(result != null &&
                         !result.errors.isEmpty()) {
                     Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
@@ -117,11 +126,17 @@ public class SearchWorker {
                         Log.e(TAG, "------");
                     }
 
-                    View rootView = a.findViewById(android.R.id.content);
-                    ErrorActivity.reportError(h, a, result.errors, null, rootView,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                            serviceName, query, R.string.light_parsing_error));
-
+                    if(result.resultList.isEmpty()&& !result.errors.isEmpty()) {
+                        // if it compleatly failes dont show snackbar, instead show error directlry
+                        ErrorActivity.reportError(h, a, result.errors, null, null,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, query, R.string.parsing_error));
+                    } else {
+                        // if it partly show snackbar
+                        ErrorActivity.reportError(h, a, result.errors, null, rootView,
+                                ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                                        serviceName, query, R.string.light_parsing_error));
+                    }
                 }
                 // hard errors:
             } catch (ReCaptchaException e) {
@@ -180,11 +195,15 @@ public class SearchWorker {
 
     }
 
-    public void search(int serviceId, String query, int page, Activity a) {
+    public void search(int serviceId,
+                       String query,
+                       int page,
+                       Activity a,
+                       EnumSet<SearchEngine.Filter> filter) {
         if(runnable != null) {
             terminate();
         }
-        runnable = new SearchRunnable(serviceId, query, page, a, requestId);
+        runnable = new SearchRunnable(serviceId, query, page, filter, a, requestId);
         Thread thread = new Thread(runnable);
         thread.start();
     }

app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java

@@ -8,7 +8,7 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SuggestionExtractor;
+import org.schabi.newpipe.extractor.SuggestionExtractor;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 

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

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
@@ -16,8 +15,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.R;
-
-import java.util.Objects;
+import org.schabi.newpipe.util.ThemeHelper;
 
 
 /**
@@ -41,16 +39,16 @@ import java.util.Objects;
  */
 
 public class SettingsActivity extends PreferenceActivity  {
-    private AppCompatDelegate mDelegate = null;
     SettingsFragment f = new SettingsFragment();
+    private AppCompatDelegate mDelegate = null;
+
+    public static void initSettings(Context context) {
+        NewPipeSettings.initSettings(context);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", getResources().getString(R.string.light_theme_title)).
-                        equals(getResources().getString(R.string.dark_theme_title)))  {
-            setTheme(R.style.DarkTheme);
-        }
+        ThemeHelper.setTheme(this, true);
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceBundle);
         super.onCreate(savedInstanceBundle);
@@ -156,8 +154,4 @@ public class SettingsActivity extends PreferenceActivity  {
         }
         return true;
     }
-
-    public static void initSettings(Context context) {
-        NewPipeSettings.initSettings(context);
-    }
 }

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

@@ -1,27 +1,27 @@
 package org.schabi.newpipe.settings;
 
 import android.app.Activity;
-import android.app.ListActivity;
 import android.content.ClipData;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.support.v7.app.AlertDialog;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
 import org.schabi.newpipe.App;
+import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 
 import java.util.ArrayList;
-import java.util.Objects;
 
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 
@@ -48,8 +48,8 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
 public class SettingsFragment  extends PreferenceFragment
         implements SharedPreferences.OnSharedPreferenceChangeListener
 {
+    public static final int REQUEST_INSTALL_ORBOT = 0x1234;
     SharedPreferences.OnSharedPreferenceChangeListener prefListener;
-
     // get keys
     String DEFAULT_RESOLUTION_PREFERENCE;
     String DEFAULT_AUDIO_FORMAT_PREFERENCE;
@@ -58,9 +58,6 @@ public class SettingsFragment  extends PreferenceFragment
     String DOWNLOAD_PATH_AUDIO_PREFERENCE;
     String USE_TOR_KEY;
     String THEME;
-
-    public static final int REQUEST_INSTALL_ORBOT = 0x1234;
-
     private ListPreference defaultResolutionPreference;
     private ListPreference defaultAudioFormatPreference;
     private ListPreference searchLanguagePreference;
@@ -98,6 +95,8 @@ public class SettingsFragment  extends PreferenceFragment
         downloadPathAudioPreference = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
         themePreference = findPreference(THEME);
 
+        final String currentTheme = defaultPreferences.getString(THEME, "Light");
+
         prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@@ -139,8 +138,27 @@ public class SettingsFragment  extends PreferenceFragment
                 }
                 else if (key == THEME)
                 {
-                    String theme = sharedPreferences.getString(THEME, "Light");
-                    themePreference.setSummary(theme);
+                    String selectedTheme = sharedPreferences.getString(THEME, "Light");
+                    themePreference.setSummary(selectedTheme);
+
+                    if(!selectedTheme.equals(currentTheme)) { // If it's not the current theme
+                        new AlertDialog.Builder(activity)
+                                .setTitle(R.string.restart_title)
+                                .setMessage(R.string.msg_restart)
+                                .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Intent intentToMain = new Intent(activity, MainActivity.class);
+                                        intentToMain.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                                        activity.startActivity(intentToMain);
+
+                                        activity.finish();
+                                        Runtime.getRuntime().exit(0);
+                                    }
+                                })
+                                .setNegativeButton(R.string.later, null)
+                                .create().show();
+                    }
                 }
                 updateSummary();
             }

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

@@ -0,0 +1,151 @@
+package org.schabi.newpipe.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+
+import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+
+import java.util.ArrayList;
+import java.util.Stack;
+
+/**
+ * Created by Christian Schabesberger on 16.02.17.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * NavStack.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * class helps to navigate within the app
+ * IMPORTAND: the top of the stack is the current activity !!!
+ */
+public class NavStack {
+    private static final String TAG = NavStack.class.toString();
+    public static final String SERVICE_ID = "service_id";
+    public static final String URL = "url";
+
+    private static final String NAV_STACK="nav_stack";
+
+    private enum ActivityId {
+        CHANNEL,
+        DETAIL
+    }
+
+    private class NavEntry {
+        public NavEntry(String url, int serviceId) {
+            this.url = url;
+            this.serviceId = serviceId;
+        }
+        public String url;
+        public int serviceId;
+    }
+
+    private static NavStack instance = new NavStack();
+    private Stack<NavEntry> stack = new Stack<NavEntry>();
+
+    private NavStack() {
+    }
+
+    public static NavStack getInstance() {
+        return instance;
+    }
+
+    private void addEntry(String url, Class ac, int serviceId) {
+        stack.push(new NavEntry(url, serviceId));
+    }
+
+    public void navBack(Activity activity) throws Exception {
+        if(stack.size() == 0) { // if stack is already empty here, activity was probably called
+            // from another app
+            activity.finish();
+            return;
+        }
+        stack.pop(); // remove curent activty, since we dont want to return to itself
+        if (stack.size() == 0) {
+            openMainActivity(activity); // if no more page is on the stack this means we are home
+            return;
+        }
+        NavEntry entry = stack.pop();  // this element will reapear, since by calling the old page
+        // this element will be pushed on top again
+        try {
+            StreamingService service = NewPipe.getService(entry.serviceId);
+            switch (service.getLinkTypeByUrl(entry.url)) {
+                case STREAM:
+                    openDetailActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case CHANNEL:
+                    openChannelActivity(activity, entry.url, entry.serviceId);
+                    break;
+                case NONE:
+                    throw new Exception("Url not known to service. service="
+                            + Integer.toString(entry.serviceId) + " url=" + entry.url);
+                default:
+                    openMainActivity(activity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public void openChannelActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, ChannelActivity.class);
+    }
+
+    public void openDetailActivity(Context context, String url, int serviceId) {
+        openActivity(context, url, serviceId, VideoItemDetailActivity.class);
+    }
+
+    private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
+        stack.push(new NavEntry(url, serviceId));
+        Intent i = new Intent(context, acitivtyClass);
+        i.putExtra(SERVICE_ID, serviceId);
+        i.putExtra(URL, url);
+        context.startActivity(i);
+    }
+
+    public void openMainActivity(Activity a) {
+        stack.clear();
+        Intent i = new Intent(a, MainActivity.class);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(a, i);
+    }
+
+    public void onSaveInstanceState(Bundle state) {
+        ArrayList<String> sa = new ArrayList<>();
+        for(NavEntry entry : stack) {
+            sa.add(entry.url);
+        }
+        state.putStringArrayList(NAV_STACK, sa);
+    }
+
+    public void restoreSavedInstanceState(Bundle state) {
+        ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
+        for(String url : sa) {
+            stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+
+public class ThemeHelper {
+
+    public static void setTheme(Context context, boolean mode) {
+        // mode is true for normal theme, false for no action bar theme.
+
+        String themeKey = context.getString(R.string.theme_key);
+        //String lightTheme = context.getResources().getString(R.string.light_theme_title);
+        String darkTheme = context.getResources().getString(R.string.dark_theme_title);
+        String blackTheme = context.getResources().getString(R.string.black_theme_title);
+
+        String sp = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(themeKey, context.getResources().getString(R.string.light_theme_title));
+
+        if (mode) {
+            if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme);
+            else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme);
+            else context.setTheme(R.style.AppTheme);
+        } else {
+            if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme_NoActionBar);
+            else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme_NoActionBar);
+            else context.setTheme(R.style.AppTheme_NoActionBar);
+        }
+    }
+}

app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java

@@ -84,9 +84,23 @@ public abstract class MissionsFragment extends Fragment
 		return v;
 	}
 
-	@Override
+	/** Added in API level 23. */
+    @Override
 	public void onAttach(Context activity) {
 		super.onAttach(activity);
+
+		// Bug: in api< 23 this is never called
+		// so mActivity=null
+		// so app crashes with nullpointer exception
+		mActivity = activity;
+	}
+
+	/** deprecated in API level 23,
+	 * but must remain to allow compatibility with api<23 */
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
 		mActivity = activity;
 	}
 

app/src/main/res/drawable-v21/splash_screen.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="?android:windowBackground"/>
+
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/ic_launcher"/>
+    </item>
+</layer-list>

app/src/main/res/drawable/splash_screen.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:drawable="?android:attr/windowBackground"/>
-
     <item>
         <bitmap
             android:gravity="center"

app/src/main/res/layout-land/channel_header.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/channel_header_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/channel_banner_image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:scaleType="center"
+        android:src="@drawable/channel_banner"
+        android:background="@android:color/black"
+        android:adjustViewBounds="true"/>
+
+    <RelativeLayout
+        android:id="@+id/channel_avatar_layout"
+        android:layout_alignTop="@id/channel_banner_image"
+        android:layout_width="@dimen/channel_avatar_halo_size"
+        android:layout_height="@dimen/channel_avatar_halo_size"
+        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="60dp">
+
+        <ImageView
+            android:id="@+id/channel_avatar_halo"
+            android:layout_width="@dimen/channel_avatar_halo_size"
+            android:layout_height="@dimen/channel_avatar_halo_size"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:src="@drawable/white_circle" />
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/channel_avatar_view"
+            android:layout_width="@dimen/channel_avatar_size"
+            android:layout_height="@dimen/channel_avatar_size"
+            android:src="@drawable/buddy"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/channel_title_view"
+        android:layout_below="@id/channel_banner_image"
+        android:layout_toEndOf="@id/channel_avatar_layout"
+        android:layout_toRightOf="@id/channel_avatar_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="4dp"
+        android:layout_marginStart="4dp"
+        android:textSize="@dimen/video_item_detail_title_text_size"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <LinearLayout
+        android:id="@+id/channel_subscriber_layout"
+        android:layout_below="@id/channel_banner_image"
+        android:layout_toEndOf="@id/channel_title_view"
+        android:layout_toRightOf="@id/channel_title_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/channel_subscribe_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/subscribe"
+            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"/>
+
+        <TextView
+            android:id="@+id/channel_subscriber_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"/>
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -1,81 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:id="@+id/rootView"
-    tools:context="org.schabi.newpipe.ChannelActivity">
+    android:orientation="vertical"
+    android:title="Channel">
 
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/channel_app_bar"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/channel_streams_view"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/app_bar_height"
-        android:fitsSystemWindows="true"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.design.widget.CollapsingToolbarLayout
-            android:id="@+id/channel_toolbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            app:contentScrim="@color/light_youtube_primary_color"
-            app:statusBarScrim="@color/light_youtube_dark_color"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-
-            <ImageView
-                android:id="@+id/channel_banner_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                android:scaleType="centerCrop"
-                android:background="@color/light_youtube_dark_color"
-                app:layout_collapseMode="parallax" />
-
-            <ImageView
-                android:id="@+id/channel_avatar_halo"
-                android:visibility="gone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="28dp"
-                android:layout_marginStart="28dp"
-                android:layout_marginTop="38dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:src="@drawable/white_circle"/>
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/channel_avatar_view"
-                android:visibility="gone"
-                android:layout_width="@dimen/channel_avatar_size"
-                android:layout_height="@dimen/channel_avatar_size"
-                android:src="@drawable/buddy"
-                android:layout_marginLeft="30dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="40dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"/>
-
-            <android.support.v7.widget.Toolbar
-                android:id="@+id/cannel_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:layout_collapseMode="pin"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/channel_rss_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="?attr/rss"
-        app:layout_anchor="@id/channel_app_bar"
-        app:layout_anchorGravity="bottom|end" />
+        android:layout_height="match_parent"
+        android:background="?android:windowBackground"
+        android:scrollbars="vertical"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -87,11 +23,4 @@
             android:layout_centerInParent="true"
             android:indeterminate="true"/>
     </RelativeLayout>
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/channel_streams_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:windowBackground"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:scrollbars="vertical"/>
-</android.support.design.widget.CoordinatorLayout>
+</RelativeLayout>

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

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/channel_header_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/channel_banner_image"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
+        android:scaleType="center"
+        android:src="@drawable/channel_banner"
+        android:background="@android:color/black"
+        android:adjustViewBounds="true"/>
+
+    <RelativeLayout
+        android:id="@+id/channel_avatar_layout"
+        android:layout_alignTop="@id/channel_banner_image"
+        android:layout_width="@dimen/channel_avatar_halo_size"
+        android:layout_height="@dimen/channel_avatar_halo_size"
+        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="30dp">
+
+        <ImageView
+            android:id="@+id/channel_avatar_halo"
+            android:layout_width="@dimen/channel_avatar_halo_size"
+            android:layout_height="@dimen/channel_avatar_halo_size"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:src="@drawable/white_circle" />
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/channel_avatar_view"
+            android:layout_width="@dimen/channel_avatar_size"
+            android:layout_height="@dimen/channel_avatar_size"
+            android:src="@drawable/buddy"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/channel_title_view"
+        android:layout_below="@id/channel_banner_image"
+        android:layout_toEndOf="@id/channel_avatar_layout"
+        android:layout_toRightOf="@id/channel_avatar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="4dp"
+        android:layout_marginStart="4dp"
+        android:textSize="@dimen/video_item_detail_title_text_size"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <LinearLayout
+        android:id="@+id/channel_subscriber_layout"
+        android:visibility="gone"
+        android:layout_below="@id/channel_avatar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/channel_subscribe_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/subscribe"
+            android:layout_marginLeft="4dp"
+            android:layout_marginStart="4dp"/>
+
+        <TextView
+            android:id="@+id/channel_subscriber_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"/>
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout android:id="@+id/item_main_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp">
+
+            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
+                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:ignore="RtlHardcoded">
+
+                <de.hdodenhof.circleimageview.CircleImageView android:id="@+id/itemThumbnailView"
+                    android:contentDescription="@string/list_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:src="@drawable/buddy_channel_item"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                android:layout_toRightOf="@id/itemThumbnailViewContainer"
+                tools:ignore="RtlHardcoded">
+
+                <TextView android:id="@+id/itemChannelTitleView"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0dp"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textSize="@dimen/channel_item_detail_title_text_size"/>
+
+                <TextView android:id="@+id/itemChannelDescriptionView"
+                    android:layout_weight="2"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0dp"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_uploader_text_size"/>
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView android:id="@+id/itemSubscriberCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textSize="@dimen/video_item_search_upload_date_text_size"
+                        android:text="1000 subs"/>
+
+                    <TextView android:id="@+id/itemVideoCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textSize="@dimen/video_item_search_upload_date_text_size"
+                        android:text="1000 vids"/>
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/item_button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/selectableItemBackground"/>
+</FrameLayout>

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

@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/video_item"
+        tools:listitem="@layout/stream_item"
         android:scrollbars="vertical"/>
 
     <ProgressBar android:id="@+id/progressBar"

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

@@ -69,7 +69,7 @@
                             android:layout_height="match_parent"
                             android:layout_below="@id/detail_stream_thumbnail_window_layout"
                             android:background="?android:windowBackground"
-                            android:visibility="gone">
+                            android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -226,6 +226,9 @@
                             android:background="#000"
                             android:layout_width="match_parent"
                             android:layout_height="1px"
+
+                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
                             android:layout_below="@id/detail_uploader_thumbnail_view"/>
                     </RelativeLayout>
                     <Button

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/paginate_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingBottom="10dp"/>
+
+</LinearLayout>

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    android:id="@+id/item_main_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp">
+
+            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
+                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:ignore="RtlHardcoded">
+
+                <ImageView
+                    android:id="@+id/itemThumbnailView"
+                    android:contentDescription="@string/list_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                    android:scaleType="centerCrop"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:src="@drawable/dummi_thumbnail_playlist"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                android:layout_toRightOf="@id/itemThumbnailViewContainer"
+                tools:ignore="RtlHardcoded">
+
+                <TextView android:id="@+id/itemTitleView"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0dp"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textSize="@dimen/video_item_search_title_text_size"/>
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/item_button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/selectableItemBackground"/>
+</FrameLayout>

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

@@ -2,12 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <item android:id="@+id/action_settings"
         app:showAsAction="never"
         android:title="@string/settings"/>
-
-    <item android:id="@+id/action_report_error"
-        app:showAsAction="never"
-        android:title="@string/report_error" />
 </menu>

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

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings"
-        app:showAsAction="never"
-        android:title="@string/settings"/>
 
     <item android:id="@+id/action_show_downloads"
         app:showAsAction="never"
         android:title="@string/downloads" />
+
+    <item android:id="@+id/action_settings"
+        app:showAsAction="never"
+        android:title="@string/settings"/>
+
 </menu>

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

@@ -2,6 +2,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="org.schabi.newpipe.ChannelActivity">
+
+    <item android:id="@+id/menu_item_openInBrowser"
+        app:showAsAction="never"
+        android:title="@string/open_in_browser" />
+
+    <item android:id="@+id/menu_item_share"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"
+        android:icon="?attr/share"/>
+
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"

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

@@ -6,4 +6,15 @@
         app:showAsAction="ifRoom"
         android:title="@string/search"
         app:actionViewClass="android.support.v7.widget.SearchView" />
+
+    <group android:id="@+id/search_filter_group"
+        android:checkableBehavior="single">
+        <item android:id="@+id/menu_filter_all"
+            android:title = "@string/all"
+            android:checked = "true"/>
+        <item android:id="@+id/menu_filter_video"
+            android:title = "@string/video"/>
+        <item android:id="@+id/menu_filter_channel"
+            android:title = "@string/channel"/>
+    </group>
 </menu>

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

@@ -5,5 +5,5 @@
     <item android:id="@+id/menu_item_screen_rotation"
         android:title="@string/screen_rotation"
         app:showAsAction="always"
-        android:icon="@drawable/ic_screen_rotation_white"/>
+        android:icon="@drawable/ic_screen_rotation_white_24dp"/>
 </menu>

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

@@ -15,12 +15,12 @@
     <item android:id="@+id/menu_item_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_share_black"/>
+        android:icon="?attr/share"/>
 
     <item android:id="@+id/action_play_with_kodi"
         android:title="@string/play_with_kodi_title"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_cast_black"/>
+        android:icon="?attr/cast"/>
 
     <item android:id="@+id/menu_item_openInBrowser"
         app:showAsAction="never"

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_search"
-        android:icon="@android:drawable/ic_menu_search"
-        app:showAsAction="ifRoom"
-        android:title="@string/search"
-        app:actionViewClass="android.support.v7.widget.SearchView" />
-
-    <item android:id="@+id/action_settings"
-        app:showAsAction="never"
-        android:title="@string/settings"/>
-
-    <item android:id="@+id/action_show_downloads"
-        app:showAsAction="never"
-        android:title="@string/downloads" />
-
-    <item android:id="@+id/action_report_error"
-        app:showAsAction="never"
-        android:title="@string/report_error" />
-</menu>