moved on to 0.7.4

Youtube has changed (again) this time it was a bit harder,
therfor the changes are deeper. May be still a bit unstable.

.gitignore

@@ -7,3 +7,4 @@
 /app/app.iml
 /.idea
 /*.iml
+gradle.properties

.travis.yml

@@ -2,15 +2,16 @@ language: android
 android:
   components:
     # The BuildTools version used by NewPipe
-    - build-tools-23.0.1
+    - tools
+    - build-tools-23.0.2
 
     # The SDK version used to compile NewPipe
     - android-23
-    
+
     # Additional components
     - extra-android-support
     - extra-android-m2repository
-   
+
     # Emulators
     - sys-img-armeabi-v7a-android-21
     - sys-img-armeabi-v7a-android-19

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+#Contribution
+
+This document contains guidelines on making contributions to NewPipe.
+
+## Programming
+
+* Follow the [Google Style Guidelines](https://google.github.io/styleguide/javaguide.html)
+* Make a new feature on a separate branch, not on the master branch
+* Make a [pull request](https://github.com/theScrabi/NewPipe/pulls) if you're done with your changes
+* When submitting changes, you agree that your code will be GPLv3 licensed
+
+## Commit messages
+
+* The subject line of your commit message shouldn't be longer than 72 characters
+* Try to keep each line of your commit message 72 characters to ensure proper
+ compatibility with all git tools
+* [This guide](http://chris.beams.io/posts/git-commit/) goes more in depth on what makes a good commit message
+
+## Translation
+
+* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+
+## Issue reporting
+
+* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue hasn't been reported before
+* Check if this issue is already fixed in the repository
+* When making bug reports, be sure to tell which version of NewPipe you are using and the steps to reproduce the problem
+* Please include a log if you can
+
+## Communication
+
+* For the time being, [Slack](http://invite.chschtsch.ml/) is being used for project communication
+* Feel free to post suggestions, changes, ideas etc!

README.md

@@ -13,8 +13,11 @@ Project status:
 
 ## Screenshots
 
-[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
-[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
 
 ## Description
 
@@ -25,13 +28,14 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search videos
 * Display general information about a video
 * Watch YouTube videos
-* Listen to YouTube videos (audio only streaming)
+* Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
-* Download videos (working, but it could be better)
-* Download audio only (working, but it could be better)
+* Download videos (experimental)
+* Download audio only (experimental)
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
+* Orbot/Tor support (no streaming yet, experimental)
 
 ### Coming Features
 
@@ -53,7 +57,7 @@ Although NewPipe only supports YouTube at the moment, it's designed to support m
 Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!
 
-Join our [Slack group](http://invite.chschtsch.ml/) if you like to get involved.
+If you'd like to get involved, check our [contribution notes](CONTRIBUTING.md).
 
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 7
-        versionName "0.6.1"
+        versionCode 13
+        versionName "0.7.4"
     }
     buildTypes {
         release {
@@ -17,13 +17,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
+
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {
@@ -31,6 +35,11 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
+    compile 'info.guardianproject.netcipher:netcipher:1.2'
+    compile 'de.hdodenhof:circleimageview:2.0.0'
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    compile 'com.github.nirhart:parallaxscroll:1.0'
 }

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java

@@ -0,0 +1,93 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.crawler.SearchEngine;
+import org.schabi.newpipe.crawler.services.youtube.YoutubeSearchEngine;
+import org.schabi.newpipe.Downloader;
+
+import java.util.ArrayList;
+
+/**
+ * Created by the-scrabi on 29.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngineTest.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 YoutubeSearchEngineTest extends AndroidTestCase {
+    private SearchEngine.Result result;
+    private ArrayList<String> suggestionReply;
+
+    @Override
+    public void setUp() throws Exception{
+        super.setUp();
+        SearchEngine engine = new YoutubeSearchEngine();
+
+        result = engine.search("https://www.youtube.com/results?search_query=bla",
+                0, "de", new Downloader());
+        suggestionReply = engine.suggestionList("hello", new Downloader());
+    }
+
+    public void testIfNoErrorOccur() {
+        assertEquals(result.errorMessage, "");
+    }
+
+    public void testIfListIsNotEmpty() {
+        assertEquals(result.resultList.size() > 0, true);
+    }
+
+    public void testItemsHaveTitle() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertEquals(i.title.isEmpty(), false);
+        }
+    }
+
+    public void testItemsHaveUploader() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertEquals(i.uploader.isEmpty(), false);
+        }
+    }
+
+    public void testItemsHaveRightDuration() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.duration, i.duration.contains(":"));
+        }
+    }
+
+    public void testItemsHaveRightThumbnail() {
+        for (VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
+        }
+    }
+
+    public void testItemsHaveRightVideoUrl() {
+        for (VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.webpage_url, i.webpage_url.contains("https://"));
+        }
+    }
+
+    public void testIfSuggestionsAreReplied() {
+        assertEquals(suggestionReply.size() > 0, true);
+    }
+
+    public void testIfSuggestionsAreValid() {
+        for(String s : suggestionReply) {
+            assertTrue(s, !s.isEmpty());
+        }
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorDefaultTest.java

@@ -0,0 +1,109 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.crawler.CrawlingException;
+import org.schabi.newpipe.crawler.ParsingException;
+import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.crawler.VideoInfo;
+
+import java.io.IOException;
+
+/**
+ * Created by the-scrabi on 30.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractorDefault.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 YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
+    private YoutubeStreamExtractor extractor;
+
+    public void setUp() throws IOException, CrawlingException {
+        /* some anonymus video test
+        extractor = new YoutubeStreamExtractor("https://www.youtube.com/watch?v=FmG385_uUys",
+                new Downloader()); */
+        /* some vevo video (suggested to test against) */
+        extractor = new YoutubeStreamExtractor("https://www.youtube.com/watch?v=YQHsXMglC9A",
+                new Downloader());
+    }
+
+    public void testGetInvalidTimeStamp() throws ParsingException {
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() <= 0);
+    }
+
+    public void testGetValidTimeStamp() throws CrawlingException, IOException {
+        YoutubeStreamExtractor extractor =
+                new YoutubeStreamExtractor("https://youtu.be/FmG385_uUys?t=174", new Downloader());
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() == 174);
+    }
+
+    public void testGetTitle() throws ParsingException {
+        assertTrue(!extractor.getTitle().isEmpty());
+    }
+
+    public void testGetDescription() throws ParsingException {
+        assertTrue(extractor.getDescription() != null);
+    }
+
+    public void testGetUploader() throws ParsingException {
+        assertTrue(!extractor.getUploader().isEmpty());
+    }
+
+    public void testGetLength() throws ParsingException {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetViews() throws ParsingException {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetUploadDate() throws ParsingException {
+        assertTrue(extractor.getUploadDate().length() > 0);
+    }
+
+    public void testGetThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getThumbnailUrl(),
+                extractor.getThumbnailUrl().contains("https://"));
+    }
+
+    public void testGetUploaderThumbnailUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderThumbnailUrl(),
+                extractor.getUploaderThumbnailUrl().contains("https://"));
+    }
+
+    public void testGetAudioStreams() throws ParsingException {
+        assertTrue(!extractor.getAudioStreams().isEmpty());
+    }
+
+    public void testGetVideoStreams() throws ParsingException {
+        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
+            assertTrue(s.url,
+                    s.url.contains("https://"));
+            assertTrue(s.resolution.length() > 0);
+            assertTrue(Integer.toString(s.format),
+                    0 <= s.format && s.format <= 4);
+        }
+    }
+
+    public void testGetDashMpd() throws ParsingException {
+        assertTrue(extractor.getDashMpdUrl(),
+                !extractor.getDashMpdUrl().isEmpty());
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeStreamExtractorGemaTest.java

@@ -0,0 +1,49 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.crawler.CrawlingException;
+import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
+
+import java.io.IOException;
+
+/**
+ * Created by the-scrabi on 30.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractorGema.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/>.
+ */
+
+
+// This class only works in Germany.
+public class YoutubeStreamExtractorGemaTest extends AndroidTestCase {
+
+    // Deaktivate this Test Case bevore uploading it githup, otherwise CI will fail.
+    private static final boolean testActive = false;
+
+    public void testGemaError() throws IOException, CrawlingException {
+        if(testActive) {
+            try {
+                new YoutubeStreamExtractor("https://www.youtube.com/watch?v=3O1_3zBUKM8",
+                        new Downloader());
+                assertTrue("Gema exception not thrown", false);
+            } catch(YoutubeStreamExtractor.GemaException ge) {
+                assertTrue(true);
+            }
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -2,11 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.schabi.newpipe" >
-
     <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name= "android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:logo="@mipmap/ic_launcher"
@@ -15,7 +16,8 @@
         tools:ignore="AllowBackup">
         <activity
             android:name=".VideoItemListActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,47 +27,52 @@
         <activity
             android:name=".VideoItemDetailActivity"
             android:label="@string/title_videoitem_detail"
-            android:theme="@style/AppTheme">
+            android:theme="@style/AppTheme"
+            android:configChanges="orientation|screenSize"
+            android:screenOrientation="portrait">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
+
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <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:host="youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="https"
-                    android:pathPrefix="/"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="http"
-                    android:pathPrefix="/"/>
+                <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" />
+            </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>
         </activity>
         <activity android:name=".PlayVideoActivity"
@@ -74,9 +81,26 @@
             android:parentActivityName=".VideoItemDetailActivity"
             tools:ignore="UnusedAttribute">
         </activity>
+        <service
+            android:name=".BackgroundPlayer"
+            android:label="@string/background_player_name"
+            android:exported="false" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
+            android:label="@string/settings_activity_title" >
         </activity>
+        <activity
+            android:name=".PanicResponderActivity"
+            android:launchMode="singleInstance"
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="info.guardianproject.panic.action.TRIGGER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ExitActivity"
+            android:theme="@android:style/Theme.NoDisplay" />
     </application>
 </manifest>

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

@@ -3,6 +3,7 @@ package org.schabi.newpipe;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -14,6 +15,12 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
+import android.widget.Toast;
+
+import org.schabi.newpipe.crawler.MediaFormat;
+import org.schabi.newpipe.crawler.VideoInfo;
+
+import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 18.08.15.
@@ -38,25 +45,23 @@ import android.widget.ArrayAdapter;
 
 class ActionBarHandler {
     private static final String TAG = ActionBarHandler.class.toString();
-    private static final String KORE_PACKET = "org.xbmc.kore";
 
-    private String websiteUrl = "";
     private AppCompatActivity activity;
-    private VideoInfo.VideoStream[] videoStreams = null;
-    private VideoInfo.AudioStream audioStream = null;
-    private int selectedStream = -1;
-    private String videoTitle = "";
+    private int selectedVideoStream = -1;
 
     private SharedPreferences defaultPreferences = null;
-    private int startPosition;
 
-    @SuppressWarnings("deprecation")
-    private class FormatItemSelectListener implements ActionBar.OnNavigationListener {
-        @Override
-        public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-            selectFormatItem((int)itemId);
-            return true;
-        }
+    // Only callbacks are listed here, there are more actions which don't need a callback.
+    // those are edited directly. Typically VideoItemDetailFragment will implement those callbacks.
+    private OnActionListener onShareListener;
+    private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onDownloadListener;
+    private OnActionListener onPlayWithKodiListener;
+    private OnActionListener onPlayAudioListener;
+
+    // Triggered when a stream related action is triggered.
+    public interface OnActionListener {
+        void onActionSelected(int selectedStreamId);
     }
 
     public ActionBarHandler(AppCompatActivity activity) {
@@ -68,62 +73,58 @@ class ActionBarHandler {
         this.activity = activity;
         try {
             activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-        } catch(NullPointerException e) {
+        } catch (NullPointerException e) {
             e.printStackTrace();
         }
     }
 
-    @SuppressWarnings("deprecation")
-    public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
-        this.videoStreams = videoStreams;
-        selectedStream = 0;
-        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        String[] itemArray = new String[videoStreams.length];
-        String defaultResolution = defaultPreferences
-                .getString(activity.getString(R.string.defaultResolutionPreference),
-                        activity.getString(R.string.defaultResolutionListItem));
-        int defaultResolutionPos = 0;
+    public void setupStreamList(final List<VideoInfo.VideoStream> videoStreams) {
+        if (activity != null) {
+            selectedVideoStream = 0;
 
-        for(int i = 0; i < videoStreams.length; i++) {
-            itemArray[i] = MediaFormat.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
-            if(defaultResolution.equals(videoStreams[i].resolution)) {
-                defaultResolutionPos = i;
+
+            // this array will be shown in the dropdown menu for selecting the stream/resolution.
+            String[] itemArray = new String[videoStreams.size()];
+            for (int i = 0; i < videoStreams.size(); i++) {
+                VideoInfo.VideoStream item = videoStreams.get(i);
+                itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
             }
-        }
+            int defaultResolution = getDefaultResolution(videoStreams);
+
+            ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
+                    android.R.layout.simple_spinner_dropdown_item, itemArray);
 
-        ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
-                android.R.layout.simple_spinner_dropdown_item, itemArray);
-        if(activity != null) {
             ActionBar ab = activity.getSupportActionBar();
-                assert ab != null : "Could not get actionbar";
-                ab.setListNavigationCallbacks(itemAdapter
-                        , new FormatItemSelectListener());
-
-            ab.setSelectedNavigationItem(defaultResolutionPos);
-        }
-
-        // set audioStream
-        audioStream = null;
-        String preferedFormat = defaultPreferences
-                .getString(activity.getString(R.string.defaultAudioFormatPreference), "webm");
-        if(preferedFormat.equals("webm")) {
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.WEBMA.id) {
-                    audioStream = s;
+            //todo: make this throwsable
+            assert ab != null : "Could not get actionbar";
+            ab.setListNavigationCallbacks(itemAdapter
+                    , new ActionBar.OnNavigationListener() {
+                @Override
+                public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+                    selectedVideoStream = (int) itemId;
+                    return true;
                 }
-            }
-        } else if(preferedFormat.equals("m4a")){
-            for(VideoInfo.AudioStream s : audioStreams) {
-                if(s.format == MediaFormat.M4A.id &&
-                        (audioStream == null || audioStream.bandwidth > s.bandwidth)) {
-                    audioStream = s;
-                }
-            }
+            });
+
+            ab.setSelectedNavigationItem(defaultResolution);
         }
     }
 
-    private void selectFormatItem(int i) {
-        selectedStream = i;
+
+    private int getDefaultResolution(final List<VideoInfo.VideoStream> videoStreams) {
+        String defaultResolution = defaultPreferences
+                .getString(activity.getString(R.string.default_resolution_key),
+                        activity.getString(R.string.default_resolution_value));
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoInfo.VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)) {
+                return i;
+            }
+        }
+        // this is actually an error,
+        // but maybe there is really no stream fitting to the default value.
+        return 0;
     }
 
     public void setupMenu(Menu menu, MenuInflater inflater) {
@@ -136,38 +137,40 @@ class ActionBarHandler {
         MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
 
         castItem.setVisible(defaultPreferences
-                .getBoolean(activity.getString(R.string.showPlayWidthKodiPreference), false));
+                .getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
     }
 
     public boolean onItemSelected(MenuItem item) {
         int id = item.getItemId();
-        switch(id) {
-            case R.id.menu_item_share:
-                if(!videoTitle.isEmpty()) {
+        switch (id) {
+            case R.id.menu_item_share: {
+                    /*
                     Intent intent = new Intent();
                     intent.setAction(Intent.ACTION_SEND);
                     intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
                     intent.setType("text/plain");
-                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.shareDialogTitle)));
-                }
+                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+                    */
+                onShareListener.onActionSelected(selectedVideoStream);
                 return true;
-            case R.id.menu_item_openInBrowser: {
-                openInBrowser();
             }
-                return true;
+            case R.id.menu_item_openInBrowser: {
+                onOpenInBrowserListener.onActionSelected(selectedVideoStream);
+            }
+            return true;
             case R.id.menu_item_download:
-                downloadVideo();
+                onDownloadListener.onActionSelected(selectedVideoStream);
                 return true;
             case R.id.action_settings: {
                 Intent intent = new Intent(activity, SettingsActivity.class);
                 activity.startActivity(intent);
+                return true;
             }
-            break;
             case R.id.action_play_with_kodi:
-                playWithKodi();
+                onPlayWithKodiListener.onActionSelected(selectedVideoStream);
                 return true;
             case R.id.menu_item_play_audio:
-                playAudio();
+                onPlayAudioListener.onActionSelected(selectedVideoStream);
                 return true;
             default:
                 Log.e(TAG, "Menu Item not known");
@@ -175,155 +178,27 @@ class ActionBarHandler {
         return false;
     }
 
-    public void setVideoInfo(String websiteUrl, String videoTitle) {
-        this.websiteUrl = websiteUrl;
-        this.videoTitle = videoTitle;
+    public int getSelectedVideoStream() {
+        return selectedVideoStream;
     }
 
-    public void playVideo() {
-        // ----------- THE MAGIC MOMENT ---------------
-        if(!videoTitle.isEmpty()) {
-            if (PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean(activity.getString(R.string.useExternalPlayer), false)) {
-
-                // External Player
-                Intent intent = new Intent();
-                try {
-                    intent.setAction(Intent.ACTION_VIEW);
-
-                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
-                            MediaFormat.getMimeById(videoStreams[selectedStream].format));
-                    intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-                    intent.putExtra("title", videoTitle);
-
-                    activity.startActivity(intent);      // HERE !!!
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                    builder.setMessage(R.string.noPlayerFound)
-                            .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent intent = new Intent();
-                                    intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
-                                    activity.startActivity(intent);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-
-                                }
-                            });
-                    builder.create().show();
-                }
-            } else {
-                // Internal Player
-                Intent intent = new Intent(activity, PlayVideoActivity.class);
-                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
-                intent.putExtra(PlayVideoActivity.VIDEO_URL, websiteUrl);
-                intent.putExtra(PlayVideoActivity.START_POSITION, startPosition);
-                activity.startActivity(intent);     //also HERE !!!
-            }
-        }
-        // --------------------------------------------
+    public void setOnShareListener(OnActionListener listener) {
+        onShareListener = listener;
     }
 
-    public void setStartPosition(int startPositionSeconds)
-    {
-        this.startPosition = startPositionSeconds;
+    public void setOnOpenInBrowserListener(OnActionListener listener) {
+        onOpenInBrowserListener = listener;
     }
 
-    private void downloadVideo() {
-        if(!videoTitle.isEmpty()) {
-            String videoSuffix = "." + MediaFormat.getSuffixById(videoStreams[selectedStream].format);
-            String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
-            Bundle args = new Bundle();
-            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-            args.putString(DownloadDialog.TITLE, videoTitle);
-            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
-            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-            DownloadDialog downloadDialog = new DownloadDialog();
-            downloadDialog.setArguments(args);
-            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
-        }
+    public void setOnDownloadListener(OnActionListener listener) {
+        onDownloadListener = listener;
     }
 
-    private void openInBrowser() {
-        if(!videoTitle.isEmpty()) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(websiteUrl));
-
-            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.chooseBrowser)));
-        }
+    public void setOnPlayWithKodiListener(OnActionListener listener) {
+        onPlayWithKodiListener = listener;
     }
 
-    private void playWithKodi() {
-        if(!videoTitle.isEmpty()) {
-            try {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setPackage(KORE_PACKET);
-                intent.setData(Uri.parse(websiteUrl.replace("https", "http")));
-                activity.startActivity(intent);
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.koreNotFound)
-                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent();
-                                intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(activity.getString(R.string.fdroidKoreUrl)));
-                                activity.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-
-                            }
-                        });
-                builder.create().show();
-            }
-        }
-    }
-
-    private void playAudio() {
-        Intent intent = new Intent();
-        try {
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.parse(audioStream.url),
-                    MediaFormat.getMimeById(audioStream.format));
-            intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-            intent.putExtra("title", videoTitle);
-            activity.startActivity(intent);      // HERE !!!
-        } catch (Exception e) {
-            e.printStackTrace();
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-            builder.setMessage(R.string.noPlayerFound)
-                    .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Intent intent = new Intent();
-                            intent.setAction(Intent.ACTION_VIEW);
-                            intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
-                            activity.startActivity(intent);
-                        }
-                    })
-                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Log.i(TAG, "You unlocked a secret unicorn.");
-                        }
-                    });
-            builder.create().show();
-            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
-            e.printStackTrace();
-        }
+    public void setOnPlayAudioListener(OnActionListener listener) {
+        onPlayAudioListener = listener;
     }
 }

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

@@ -0,0 +1,42 @@
+package org.schabi.newpipe;
+
+/**
+ * Created by Christian Schabesberger on 24.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ActivityCommunicator.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 android.graphics.Bitmap;
+
+/**
+ * Singleton:
+ * Used to send data between certain Activity/Services within the same process.
+ * This can be considered as hack inside the Android universe. **/
+public class ActivityCommunicator {
+
+    private static ActivityCommunicator activityCommunicator = null;
+
+    public static ActivityCommunicator getCommunicator() {
+        if(activityCommunicator == null) {
+            activityCommunicator = new ActivityCommunicator();
+        }
+        return activityCommunicator;
+    }
+
+    // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
+    public volatile Bitmap backgroundPlayerThumbnail;
+}

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

@@ -0,0 +1,78 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+
+import info.guardianproject.netcipher.NetCipher;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * App.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 App extends Application {
+
+    private static boolean useTor;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        // Initialize image loader
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
+        ImageLoader.getInstance().init(config);
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
+            OrbotHelper.requestStartTor(this);
+            configureTor(true);
+        } else {
+            configureTor(false);
+        }
+
+        // DO NOT REMOVE THIS FUNCTION!!!
+        // Otherwise downloadPathPreference has invalid value.
+        SettingsActivity.initSettings(this);
+    }
+
+    /**
+     * Set the proxy settings based on whether Tor should be enabled or not.
+     */
+    static void configureTor(boolean enabled) {
+        useTor = enabled;
+        if (useTor) {
+            NetCipher.useTor();
+        } else {
+            NetCipher.setProxy(null);
+        }
+    }
+
+    static void checkStartTor(Context context) {
+        if (useTor) {
+            OrbotHelper.requestStartTor(context);
+        }
+    }
+
+    static boolean isUsingTor() {
+        return useTor;
+    }
+}

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

@@ -0,0 +1,368 @@
+package org.schabi.newpipe;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.net.wifi.WifiManager;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import java.io.IOException;
+
+/**
+ * Created by Adam Howard on 08/11/15.
+ * Copyright (c) Adam Howard <achdisposable1@gmail.com> 2015
+ *
+ * BackgroundPlayer.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/>.
+ */
+
+/**Plays the audio stream of videos in the background.*/
+public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPreparedListener*/ {
+
+    private static final String TAG = BackgroundPlayer.class.toString();
+    private static final String ACTION_STOP = TAG + ".STOP";
+    private static final String ACTION_PLAYPAUSE = TAG + ".PLAYPAUSE";
+
+    // Extra intent arguments
+    public static final String TITLE = "title";
+    public static final String WEB_URL = "web_url";
+    public static final String SERVICE_ID = "service_id";
+    public static final String CHANNEL_NAME = "channel_name";
+
+    private volatile String webUrl = "";
+    private volatile int serviceId = -1;
+    private volatile String channelName = "";
+
+    // Determines if the service is already running.
+    // Prevents launching the service twice.
+    public static volatile boolean isRunning = false;
+
+    public BackgroundPlayer() {
+        super();
+    }
+
+    @Override
+    public void onCreate() {
+        /*PendingIntent pi = PendingIntent.getActivity(this, 0,
+                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);*/
+        super.onCreate();
+    }
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Toast.makeText(this, R.string.background_player_playing_toast,
+                Toast.LENGTH_SHORT).show();
+
+        String source = intent.getDataString();
+        //Log.i(TAG, "backgroundPLayer source:"+source);
+        String videoTitle = intent.getStringExtra(TITLE);
+        webUrl = intent.getStringExtra(WEB_URL);
+        serviceId = intent.getIntExtra(SERVICE_ID, -1);
+        channelName = intent.getStringExtra(CHANNEL_NAME);
+
+        //do nearly everything in a separate thread
+        PlayerThread player = new PlayerThread(source, videoTitle, this);
+        player.start();
+
+        isRunning = true;
+
+        // If we get killed after returning here, don't restart
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // We don't provide binding (yet?), so return null
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        //Toast.makeText(this, "service done", Toast.LENGTH_SHORT).show();
+        isRunning = false;
+    }
+
+    private class PlayerThread extends Thread {
+        MediaPlayer mediaPlayer;
+        private String source;
+        private String title;
+        private int noteID = TAG.hashCode();
+        private BackgroundPlayer owner;
+        private NotificationManager noteMgr;
+        private WifiManager.WifiLock wifiLock;
+        private Bitmap videoThumbnail = null;
+        private NotificationCompat.Builder noteBuilder;
+        private Notification note;
+
+        public PlayerThread(String src, String title, BackgroundPlayer owner) {
+            this.source = src;
+            this.title = title;
+            this.owner = owner;
+            mediaPlayer = new MediaPlayer();
+            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+        }
+
+        @Override
+        public void run() {
+            mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);//cpu lock
+            try {
+                mediaPlayer.setDataSource(source);
+                //We are already in a separate worker thread,
+                //so calling the blocking prepare() method should be ok
+                mediaPlayer.prepare();
+
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+                Log.e(TAG, "video source:" + source);
+                Log.e(TAG, "video title:" + title);
+                //can't do anything useful without a file to play; exit early
+                return;
+            }
+
+            try {
+                videoThumbnail = ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail;
+            } catch (Exception e) {
+                Log.e(TAG, "Could not get video thumbnail from ActivityCommunicator");
+                e.printStackTrace();
+            }
+
+            WifiManager wifiMgr = ((WifiManager)getSystemService(Context.WIFI_SERVICE));
+            wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
+
+            //listen for end of video
+            mediaPlayer.setOnCompletionListener(new EndListener(wifiLock));
+
+            //get audio focus
+            /*
+            AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC,
+                    AudioManager.AUDIOFOCUS_GAIN);
+
+            if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+                // could not get audio focus.
+            }*/
+            wifiLock.acquire();
+            mediaPlayer.start();
+
+            IntentFilter filter = new IntentFilter();
+            filter.setPriority(Integer.MAX_VALUE);
+            filter.addAction(ACTION_PLAYPAUSE);
+            filter.addAction(ACTION_STOP);
+            registerReceiver(broadcastReceiver, filter);
+
+            note = buildNotification();
+
+            startForeground(noteID, note);
+
+            //currently decommissioned progressbar looping update code - works, but doesn't fit inside
+            //Notification.MediaStyle Notification layout.
+            noteMgr = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+            /*
+            //update every 2s or 4 times in the video, whichever is shorter
+            int sleepTime = Math.min(2000, (int)((double)vidLength/4));
+            while(mediaPlayer.isPlaying()) {
+                noteBuilder.setProgress(vidLength, mediaPlayer.getCurrentPosition(), false);
+                noteMgr.notify(noteID, noteBuilder.build());
+                try {
+                    Thread.sleep(sleepTime);
+                } catch (InterruptedException e) {
+                    Log.d(TAG, "sleep failure");
+                }
+            }*/
+        }
+
+        /**Handles button presses from the notification. */
+        private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                //Log.i(TAG, "received broadcast action:"+action);
+                if(action.equals(ACTION_PLAYPAUSE)) {
+                    if(mediaPlayer.isPlaying()) {
+                        mediaPlayer.pause();
+                        note.contentView.setImageViewResource(R.id.backgroundPlayPause, R.drawable.ic_play_circle_filled_white_24dp);
+                        if(android.os.Build.VERSION.SDK_INT >=16){
+                            note.bigContentView.setImageViewResource(R.id.backgroundPlayPause, R.drawable.ic_play_circle_filled_white_24dp);
+                        }
+                        noteMgr.notify(noteID, note);
+                    }
+                    else {
+                        //reacquire CPU lock after auto-releasing it on pause
+                        mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
+                        mediaPlayer.start();
+                        note.contentView.setImageViewResource(R.id.backgroundPlayPause, R.drawable.ic_pause_white_24dp);
+                        if(android.os.Build.VERSION.SDK_INT >=16){
+                            note.bigContentView.setImageViewResource(R.id.backgroundPlayPause, R.drawable.ic_pause_white_24dp);
+                        }
+                        noteMgr.notify(noteID, note);
+                    }
+                }
+                else if(action.equals(ACTION_STOP)) {
+                    //this auto-releases CPU lock
+                    mediaPlayer.stop();
+                    afterPlayCleanup();
+                }
+            }
+        };
+
+        private void afterPlayCleanup() {
+            //remove progress bar
+            //noteBuilder.setProgress(0, 0, false);
+
+            //remove notification
+            noteMgr.cancel(noteID);
+            unregisterReceiver(broadcastReceiver);
+            //release mediaPlayer's system resources
+            mediaPlayer.release();
+
+            //release wifilock
+            wifiLock.release();
+            //remove foreground status of service; make BackgroundPlayer killable
+            stopForeground(true);
+
+            stopSelf();
+        }
+
+        private class EndListener implements MediaPlayer.OnCompletionListener {
+            private WifiManager.WifiLock wl;
+            public EndListener(WifiManager.WifiLock wifiLock) {
+                this.wl = wifiLock;
+            }
+
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                afterPlayCleanup();
+            }
+        }
+
+        private Notification buildNotification() {
+            Notification note;
+            Resources res = getApplicationContext().getResources();
+            noteBuilder = new NotificationCompat.Builder(owner);
+
+            PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_PLAYPAUSE), PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent stopPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_STOP), PendingIntent.FLAG_UPDATE_CURRENT);
+            /*
+            NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
+                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
+            */
+
+            //build intent to return to video, on tapping notification
+            Intent openDetailView = new Intent(getApplicationContext(),
+                    VideoItemDetailActivity.class);
+            openDetailView.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
+            openDetailView.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
+            openDetailView.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            noteBuilder
+                    .setOngoing(true)
+                    .setDeleteIntent(stopPI)
+                            //doesn't fit with Notification.MediaStyle
+                            //.setProgress(vidLength, 0, false)
+                    .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                    .setTicker(
+                            String.format(res.getString(
+                                    R.string.background_player_time_text), title))
+                    .setContentIntent(PendingIntent.getActivity(getApplicationContext(),
+                            noteID, openDetailView,
+                            PendingIntent.FLAG_UPDATE_CURRENT));
+
+
+            if (android.os.Build.VERSION.SDK_INT < 21) {
+
+                NotificationCompat.Action playButton = new NotificationCompat.Action.Builder
+                        (R.drawable.ic_play_arrow_white_48dp,
+                                res.getString(R.string.play_btn_text), playPI).build();
+
+                noteBuilder
+                        .setContentTitle(title)
+                                //really? Id like to put something more helpful here.
+                                //was more of a placeholder than anything else. -medavox
+                                //.setContentText("NewPipe is playing in the background")
+                        .setContentText(channelName)
+                                //.setAutoCancel(!mediaPlayer.isPlaying())
+                        .setDeleteIntent(stopPI)
+                                //doesn't fit with Notification.MediaStyle
+                                //.setProgress(vidLength, 0, false)
+                        .setLargeIcon(videoThumbnail)
+                        .addAction(playButton);
+                        //.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                        //.setLargeIcon(cover)
+
+                //is wrapping this in an SDK version check really necessary,
+                // if we're using NotificationCompat?
+                // the compat libraries should handle this, right? -medavox
+                if (android.os.Build.VERSION.SDK_INT >= 16)
+                    noteBuilder.setPriority(Notification.PRIORITY_LOW);
+
+                noteBuilder.setStyle(new NotificationCompat.MediaStyle()
+                        //.setMediaSession(mMediaSession.getSessionToken())
+                        .setShowActionsInCompactView(new int[]{0})
+                        .setShowCancelButton(true)
+                        .setCancelButtonIntent(stopPI));
+                if (videoThumbnail != null) {
+                    noteBuilder.setLargeIcon(videoThumbnail);
+                }
+                note = noteBuilder.build();
+            } else {
+                RemoteViews view =
+                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
+                view.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
+                view.setTextViewText(R.id.backgroundSongName, title);
+                view.setTextViewText(R.id.backgroundArtist, channelName);
+                view.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
+                view.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
+
+                //possibly found the expandedView problem,
+                //but can't test it as I don't have a 5.0 device. -medavox
+                RemoteViews expandedView =
+                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
+                expandedView.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
+                expandedView.setTextViewText(R.id.backgroundSongName, title);
+                expandedView.setTextViewText(R.id.backgroundArtist, channelName);
+                expandedView.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
+                expandedView.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
+
+                noteBuilder.setCategory(Notification.CATEGORY_TRANSPORT);
+
+                //Make notification appear on lockscreen
+                noteBuilder.setVisibility(Notification.VISIBILITY_PUBLIC);
+
+                note = noteBuilder.build();
+                note.contentView = view;
+
+                //todo: This never shows up. I was not able to figure out why:
+                note.bigContentView = expandedView;
+            }
+
+            return note;
+        }
+    }
+}

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

@@ -1,19 +1,29 @@
 package org.schabi.newpipe;
 
+import android.Manifest;
+import android.app.Activity;
 import android.app.Dialog;
 import android.app.DownloadManager;
+import android.app.Notification;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
+import android.widget.Toast;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 21.09.15.
@@ -50,42 +60,95 @@ public class DownloadDialog extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         arguments = getArguments();
         super.onCreateDialog(savedInstanceState);
+        if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.downloadDialogTitle)
-                .setItems(R.array.downloadOptions, new DialogInterface.OnClickListener() {
+        builder.setTitle(R.string.download_dialog_title)
+                .setItems(R.array.download_options, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Context context = getActivity();
-                        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                         String suffix = "";
                         String title = arguments.getString(TITLE);
                         String url = "";
+                        File downloadDir = NewPipeSettings.getDownloadFolder();
                         switch(which) {
                             case 0:     // Video
                                 suffix = arguments.getString(FILE_SUFFIX_VIDEO);
                                 url = arguments.getString(VIDEO_URL);
+                                downloadDir = NewPipeSettings.getVideoDownloadFolder(context);
                                 break;
                             case 1:
                                 suffix = arguments.getString(FILE_SUFFIX_AUDIO);
                                 url = arguments.getString(AUDIO_URL);
+                                downloadDir = NewPipeSettings.getAudioDownloadFolder(context);
                                 break;
                             default:
                                 Log.d(TAG, "lolz");
                         }
-                        DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-                        DownloadManager.Request request = new DownloadManager.Request(
-                                Uri.parse(url));
-                        request.setDestinationUri(Uri.fromFile(new File(
-                                defaultPreferences.getString("download_path_preference", "/storage/emulated/0/NewPipe")
-                                        + "/" + title + suffix)));
-                        try {
-                            dm.enqueue(request);
-                        } catch (Exception e) {
-                            e.printStackTrace();
+                        if(!downloadDir.exists()) {
+                            //attempt to create directory
+                            boolean mkdir = downloadDir.mkdirs();
+                            if(!mkdir && !downloadDir.isDirectory()) {
+                                String message = context.getString(R.string.err_dir_create,downloadDir.toString());
+                                Log.e(TAG, message);
+                                Toast.makeText(context,message , Toast.LENGTH_LONG).show();
+
+                                return;
+                            }
+                            String message = context.getString(R.string.info_dir_created,downloadDir.toString());
+                            Log.e(TAG, message);
+                            Toast.makeText(context,message , Toast.LENGTH_LONG).show();
                         }
+
+                        File saveFilePath = new File(downloadDir,createFileName(title) + suffix);
+
+                        long id = 0;
+                        if (App.isUsingTor()) {
+                            // if using Tor, do not use DownloadManager because the proxy cannot be set
+                            FileDownloader.downloadFile(getContext(), url, saveFilePath, title);
+                        } else {
+                            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                            DownloadManager.Request request = new DownloadManager.Request(
+                                    Uri.parse(url));
+                            request.setDestinationUri(Uri.fromFile(saveFilePath));
+                            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+
+                            request.setTitle(title);
+                            request.setDescription("'" + url +
+                                    "' => '" + saveFilePath + "'");
+                            request.allowScanningByMediaScanner();
+
+                            try {
+                                id = dm.enqueue(request);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        Log.i(TAG,"Started downloading '" + url +
+                                "' => '" + saveFilePath + "' #" + id);
                     }
                 });
         return builder.create();
     }
 
+    /**
+     * #143 #44 #42 #22: make shure that the filename does not contain illegal chars.
+     * This should fix some of the "cannot download" problems.
+     * */
+    private String createFileName(String fName) {
+        // from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
+
+        List<String> forbiddenCharsPatterns = new ArrayList<String> ();
+        forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
+        forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+");  // Windows
+        forbiddenCharsPatterns.add("[^\\w\\d\\.]+");  // last chance... only latin letters and digits
+        String nameToTest = fName;
+        for (String pattern : forbiddenCharsPatterns) {
+            nameToTest = nameToTest.replaceAll(pattern, "_");
+        }
+        return nameToTest;
+    }
 }

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

@@ -3,14 +3,17 @@ package org.schabi.newpipe;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.UnknownHostException;
 
+import javax.net.ssl.HttpsURLConnection;
+
+import info.guardianproject.netcipher.NetCipher;
+
 /**
- * Created by Christian Schabesberger on 14.08.15.
+ * Created by Christian Schabesberger on 28.01.16.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * 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
@@ -27,70 +30,61 @@ import java.net.UnknownHostException;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader {
-
-    private static final String USER_AGENT = "Mozilla/5.0";
+public class Downloader implements org.schabi.newpipe.crawler.Downloader {
+    
+    private static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0";
 
     /**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*/
-    public static String download(String siteUrl, String language) {
-        String ret = "";
-        try {
-            URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-            con.setRequestProperty("Accept-Language", language);
-            ret = dl(con);
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-        return ret;
+    public String download(String siteUrl, String language) throws IOException {
+        URL url = new URL(siteUrl);
+        //HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
+        con.setRequestProperty("Accept-Language", language);
+        return dl(con);
     }
+
     /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpURLConnection con) throws IOException {
+    private static String dl(HttpsURLConnection con) throws IOException {
         StringBuilder response = new StringBuilder();
+        BufferedReader in = null;
 
         try {
             con.setRequestMethod("GET");
             con.setRequestProperty("User-Agent", USER_AGENT);
 
-            BufferedReader in = new BufferedReader(
+            in = new BufferedReader(
                     new InputStreamReader(con.getInputStream()));
             String inputLine;
 
             while((inputLine = in.readLine()) != null) {
                 response.append(inputLine);
             }
-            in.close();
-
-        }
-        catch(UnknownHostException uhe) {//thrown when there's no internet connection
-            uhe.printStackTrace();
+        } catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            throw new IOException("unknown host or no network", uhe);
             //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        } catch(Exception e) {
+            throw new IOException(e);
+        } finally {
+            if(in != null) {
+                in.close();
+            }
         }
 
         return response.toString();
     }
 
-/**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*/
-    public static String download(String siteUrl) {
-        String ret = "";
-
-        try {
-            URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
-            ret = dl(con);
-        }
-        catch(Exception e) {
-            e.printStackTrace();
-        }
-
-        return ret;
+    /**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*/
+    public String download(String siteUrl) throws IOException {
+        URL url = new URL(siteUrl);
+        HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+        //HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
+        return dl(con);
     }
 }

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

@@ -0,0 +1,54 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * ExitActivity.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 ExitActivity extends Activity {
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+
+        System.exit(0);
+    }
+
+    public static void exitAndRemoveFromRecentApps(Activity activity) {
+        Intent intent = new Intent(activity, ExitActivity.class);
+
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+
+        activity.startActivity(intent);
+    }
+}

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

@@ -0,0 +1,169 @@
+package org.schabi.newpipe;
+
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import info.guardianproject.netcipher.NetCipher;
+
+/**
+ * Created by Christian Schabesberger on 14.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * FileDownloader.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 FileDownloader extends AsyncTask<Void, Integer, Void> {
+    public static final String TAG = "FileDownloader";
+
+
+    private NotificationManager nm;
+    private NotificationCompat.Builder builder;
+    private int notifyId = 0x1234;
+    private int fileSize = 0xffffffff;
+
+    private final Context context;
+    private final String fileURL;
+    private final File saveFilePath;
+    private final String title;
+
+    private final String debugContext;
+
+    public FileDownloader(Context context, String fileURL, File saveFilePath, String title) {
+        this.context = context;
+        this.fileURL = fileURL;
+        this.saveFilePath = saveFilePath;
+        this.title = title;
+
+        this.debugContext = "'" + fileURL +
+                "' => '" + saveFilePath + "'";
+    }
+
+    /**
+     * Downloads a file from a URL in the background using an {@link AsyncTask}.
+     *
+     * @param fileURL      HTTP URL of the file to be downloaded
+     * @param saveFilePath path of the directory to save the file
+     * @param title
+     * @throws IOException
+     */
+    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
+        new FileDownloader(context, fileURL, saveFilePath, title).execute();
+    }
+
+    /** AsyncTask impl: executed in gui thread */
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+        nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
+        builder = new NotificationCompat.Builder(context)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setLargeIcon(((BitmapDrawable) icon).getBitmap())
+                .setContentTitle(saveFilePath.getName())
+                .setContentText(saveFilePath.getAbsolutePath())
+                .setProgress(fileSize, 0, false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    /** AsyncTask impl: executed in background thread does the download */
+    @Override
+    protected Void doInBackground(Void... voids) {
+        HttpsURLConnection con = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        try {
+            con = NetCipher.getHttpsURLConnection(fileURL);
+            int responseCode = con.getResponseCode();
+
+            // always check HTTP response code first
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                fileSize = con.getContentLength();
+                inputStream = new BufferedInputStream(con.getInputStream());
+                outputStream = new FileOutputStream(saveFilePath);
+
+                int bufferSize = 8192;
+                int downloaded = 0;
+
+                int bytesRead = -1;
+                byte[] buffer = new byte[bufferSize];
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                    downloaded += bytesRead;
+                    if (downloaded % 50000 < bufferSize) {
+                        publishProgress(downloaded);
+                    }
+                }
+
+                publishProgress(bufferSize);
+
+            } else {
+                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
+            e.printStackTrace();
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                }
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (con != null) {
+                con.disconnect();
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... progress) {
+        builder.setProgress(fileSize, progress[0], false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+        super.onPostExecute(aVoid);
+        nm.cancel(notifyId);
+    }
+
+}

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

@@ -0,0 +1,93 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Created by chschtsch on 12/29/15.
+ *
+ * Copyright (C) Gregory Arkhipov 2015
+ * Localization.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 Localization {
+
+    public static Locale getPreferredLocale(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+
+        String languageCode = sp.getString(String.valueOf(R.string.search_language_key),
+                context.getString(R.string.default_language_value));
+
+        if(languageCode.length() == 2) {
+            return new Locale(languageCode);
+        }
+        else if(languageCode.contains("_")) {
+            String country = languageCode
+                    .substring(languageCode.indexOf("_"), languageCode.length());
+            return new Locale(languageCode.substring(0, 2), country);
+        }
+        return Locale.getDefault();
+    }
+
+    public static String localizeViewCount(long viewCount, Context context) {
+        Locale locale = getPreferredLocale(context);
+
+        Resources res = context.getResources();
+        String viewsString = res.getString(R.string.view_count_text);
+
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        String formattedViewCount = nf.format(viewCount);
+        return String.format(viewsString, formattedViewCount);
+    }
+
+    public static String localizeNumber(long number, Context context) {
+        Locale locale = getPreferredLocale(context);
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        return nf.format(number);
+    }
+
+    private static String formatDate(String date, Context context) {
+        Locale locale = getPreferredLocale(context);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        Date datum = null;
+        try {
+            datum = formatter.parse(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+
+        return df.format(datum);
+    }
+
+    public static String localizeDate(String date, Context context) {
+        Resources res = context.getResources();
+        String dateString = res.getString(R.string.upload_date_text);
+
+        String formattedDate = formatDate(date, context);
+        return String.format(dateString, formattedDate);
+    }
+}

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

@@ -0,0 +1,72 @@
+/**
+ * Created by k3b on 07.01.2016.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * NewPipeSettings.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/>.
+ */
+
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+
+/**
+ * Helper for global settings
+ */
+public class NewPipeSettings {
+    public static void initSettings(Context context) {
+        PreferenceManager.setDefaultValues(context, R.xml.settings, false);
+        getVideoDownloadFolder(context);
+        getAudioDownloadFolder(context);
+    }
+
+    public static File getDownloadFolder() {
+        return getFolder(Environment.DIRECTORY_DOWNLOADS);
+    }
+
+    public static File getVideoDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
+    }
+
+    public static File getAudioDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
+    }
+
+    private static File getFolder(Context context, int keyID, String defaultDirectoryName) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(keyID);
+        String downloadPath = prefs.getString(key, null);
+        if ((downloadPath != null) && (!downloadPath.isEmpty())) return new File(downloadPath.trim());
+
+        final File folder = getFolder(defaultDirectoryName);
+        SharedPreferences.Editor spEditor = prefs.edit();
+        spEditor.putString(key
+                , new File(folder,"NewPipe").getAbsolutePath());
+        spEditor.apply();
+        return folder;
+    }
+
+    @NonNull
+    private static File getFolder(String defaultDirectoryName) {
+        return new File(Environment.getExternalStorageDirectory(),defaultDirectoryName);
+    }
+}

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

@@ -0,0 +1,50 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.media.AudioManager;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * PanicResponderActivity.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 PanicResponderActivity extends Activity {
+
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            // TODO explicitly clear the search results once they are restored when the app restarts
+            // or if the app reloads the current video after being killed, that should be cleared also
+            ExitActivity.exitAndRemoveFromRecentApps(this);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.media.MediaPlayer;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -78,7 +79,7 @@ public class PlayVideoActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_play_video);
-
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
         isLandscape = checkIfLandscape();
         hasSoftKeys = checkIfHasSoftKeys();
 
@@ -129,7 +130,7 @@ public class PlayVideoActivity extends AppCompatActivity {
             public void onPrepared(MediaPlayer mp) {
                 progressBar.setVisibility(View.GONE);
                 videoView.seekTo(position);
-                if (position == 0) {
+                if (position <= 0) {
                     videoView.start();
                     showUi();
                 } else {
@@ -187,6 +188,18 @@ public class PlayVideoActivity extends AppCompatActivity {
         videoView.pause();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        prefs = getPreferences(Context.MODE_PRIVATE);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
@@ -199,7 +212,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                 intent.setAction(Intent.ACTION_SEND);
                 intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
                 intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
                 break;
             case R.id.menu_item_screen_rotation:
                 toggleOrientation();

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

@@ -1,10 +1,16 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Environment;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
@@ -17,6 +23,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
 /**
  * Created by Christian Schabesberger on 31.08.15.
  *
@@ -37,8 +45,9 @@ import android.view.ViewGroup;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class SettingsActivity extends PreferenceActivity {
+public class SettingsActivity extends PreferenceActivity  {
 
+    private static final int REQUEST_INSTALL_ORBOT = 0x1234;
     private AppCompatDelegate mDelegate = null;
 
     @Override
@@ -55,12 +64,108 @@ public class SettingsActivity extends PreferenceActivity {
 
     }
 
-    public static class SettingsFragment extends PreferenceFragment {
+    public static class SettingsFragment extends PreferenceFragment{
+        SharedPreferences.OnSharedPreferenceChangeListener prefListener;
+
+        // get keys
+        String DEFAULT_RESOLUTION_PREFERENCE;
+        String DEFAULT_AUDIO_FORMAT_PREFERENCE;
+        String SEARCH_LANGUAGE_PREFERENCE;
+        String DOWNLOAD_PATH_PREFERENCE;
+        String DOWNLOAD_PATH_AUDIO_PREFERENCE;
+        String USE_TOR_KEY;
+
+        private ListPreference defaultResolutionPreference;
+        private ListPreference defaultAudioFormatPreference;
+        private ListPreference searchLanguagePreference;
+        private EditTextPreference downloadPathPreference;
+        private EditTextPreference downloadPathAudioPreference;
+        private CheckBoxPreference useTorCheckBox;
+        private SharedPreferences defaultPreferences;
+
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.settings_screen);
+            addPreferencesFromResource(R.xml.settings);
+
+            final Activity activity = getActivity();
+
+            defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+
+            // get keys
+            DEFAULT_RESOLUTION_PREFERENCE =getString(R.string.default_resolution_key);
+            DEFAULT_AUDIO_FORMAT_PREFERENCE =getString(R.string.default_audio_format_key);
+            SEARCH_LANGUAGE_PREFERENCE =getString(R.string.search_language_key);
+            DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
+            DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+            USE_TOR_KEY = getString(R.string.use_tor_key);
+
+            // get pref objects
+            defaultResolutionPreference =
+                    (ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
+            defaultAudioFormatPreference =
+                    (ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
+            searchLanguagePreference =
+                    (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
+            downloadPathPreference =
+                    (EditTextPreference) findPreference(DOWNLOAD_PATH_PREFERENCE);
+            downloadPathAudioPreference =
+                    (EditTextPreference) findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+            useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
+
+            prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+                @Override
+                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                                      String key) {
+                    Activity a = getActivity();
+                    updateSummary();
+
+                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
+                        if (OrbotHelper.isOrbotInstalled(a)) {
+                            App.configureTor(true);
+                            OrbotHelper.requestStartTor(a);
+                        } else {
+                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
+                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                        }
+                    } else {
+                        App.configureTor(false);
+                    }
+                }
+            };
+            defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
+
+            updateSummary();
         }
+
+        // This is used to show the status of some preference in the description
+        private void updateSummary() {
+            defaultResolutionPreference.setSummary(
+                    defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
+                            getString(R.string.default_resolution_value)));
+            defaultAudioFormatPreference.setSummary(
+                    defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
+                            getString(R.string.default_audio_format_value)));
+            searchLanguagePreference.setSummary(
+                    defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
+                            getString(R.string.default_language_value)));
+            downloadPathPreference.setSummary(
+                    defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
+                            getString(R.string.download_path_summary)));
+            downloadPathAudioPreference.setSummary(
+                    defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                            getString(R.string.download_path_audio_summary)));
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // try to start tor regardless of resultCode since clicking back after
+        // installing the app does not necessarily return RESULT_OK
+        App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
+                && OrbotHelper.requestStartTor(this));
     }
 
     @Override
@@ -150,15 +255,6 @@ public class SettingsActivity extends PreferenceActivity {
     }
 
     public static void initSettings(Context context) {
-        PreferenceManager.setDefaultValues(context, R.xml.settings_screen, false);
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        if(sp.getString(context.getString(R.string.downloadPathPreference), "").isEmpty()){
-            SharedPreferences.Editor spEditor = sp.edit();
-            String newPipeDownloadStorage =
-                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
-            spEditor.putString(context.getString(R.string.downloadPathPreference)
-                    , newPipeDownloadStorage);
-            spEditor.apply();
-        }
+        NewPipeSettings.initSettings(context);
     }
 }

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

@@ -1,101 +0,0 @@
-package org.schabi.newpipe;
-
-import org.schabi.newpipe.services.AbstractVideoInfo;
-
-import java.util.List;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfo.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 VideoInfo extends AbstractVideoInfo {
-
-    public String uploader_thumbnail_url = "";
-    public String description = "";
-    public VideoStream[] videoStreams = null;
-    public AudioStream[] audioStreams = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
-    public int duration = -1;
-
-    /*YouTube-specific fields
-    todo: move these to a subclass*/
-    public int age_limit = 0;
-    public int like_count = -1;
-    public int dislike_count = -1;
-    public String average_rating = "";
-    public VideoPreviewInfo nextVideo = null;
-    public List<VideoPreviewInfo> relatedVideos = null;
-    public int startPosition = -1;//in seconds. some metadata is not passed using a VideoInfo object!
-
-    public static final int VIDEO_AVAILABLE = 0x00;
-    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation
-
-
-    public VideoInfo() {}
-
-
-    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
-     * All the shared properties are copied to the new VideoInfo.*/
-    @SuppressWarnings("WeakerAccess")
-    public VideoInfo(AbstractVideoInfo avi) {
-        this.id = avi.id;
-        this.title = avi.title;
-        this.uploader = avi.uploader;
-        this.thumbnail_url = avi.thumbnail_url;
-        this.thumbnail = avi.thumbnail;
-        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 VideoPreviewInfo) {//shitty String to convert code
-            String dur = ((VideoPreviewInfo)avi).duration;
-            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
-            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
-            this.duration = (minutes*60)+seconds;
-        }
-    }
-
-    public static class VideoStream {
-        public String url = "";     //url of the stream
-        public int format = -1;
-        public String resolution = "";
-
-        public VideoStream(String url, int format, String res) {
-            this.url = url; this.format = format; resolution = res;
-        }
-    }
-
-    @SuppressWarnings("unused")
-    public static class AudioStream {
-        public String url = "";
-        public int format = -1;
-        public int bandwidth = -1;
-        public int samplingRate = -1;
-
-        public AudioStream(String url, int format, int bandwidth, int samplingRate) {
-            this.url = url; this.format = format;
-            this.bandwidth = bandwidth; this.samplingRate = samplingRate;
-        }
-    }
-}

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

@@ -1,11 +1,16 @@
 package org.schabi.newpipe;
 
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+
 /**
  * Created by Christian Schabesberger on 24.10.15.
  *
@@ -28,12 +33,14 @@ import android.widget.TextView;
 
 class VideoInfoItemViewCreator {
     private final LayoutInflater inflater;
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder().cacheInMemory(true).build();
 
     public VideoInfoItemViewCreator(LayoutInflater inflater) {
         this.inflater = inflater;
     }
 
-    public View getViewByVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info) {
+    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info, Context context) {
         ViewHolder holder;
         if(convertView == null) {
             convertView = inflater.inflate(R.layout.video_item, parent, false);
@@ -43,6 +50,7 @@ class VideoInfoItemViewCreator {
             holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
             holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
             holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
+            holder.itemViewCountView = (TextView) convertView.findViewById(R.id.itemViewCountView);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
@@ -56,19 +64,31 @@ class VideoInfoItemViewCreator {
         holder.itemVideoTitleView.setText(info.title);
         holder.itemUploaderView.setText(info.uploader);
         holder.itemDurationView.setText(info.duration);
+        holder.itemViewCountView.setText(shortViewCount(info.view_count));
         if(!info.upload_date.isEmpty()) {
-            holder.itemUploadDateView.setText(info.upload_date);
-        } else {
-            //tweak if necessary: This is a hack to prevent having white space in the layout :P
-            holder.itemUploadDateView.setText(String.format("%d", info.view_count));
+            holder.itemUploadDateView.setText(info.upload_date+" • ");
         }
 
+        imageLoader.displayImage(info.thumbnail_url, holder.itemThumbnailView, displayImageOptions);
+
         return convertView;
     }
 
     private class ViewHolder {
         public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
+        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView, itemViewCountView;
+    }
+
+    private String shortViewCount(Long view_count){
+        if(view_count >= 1000000000){
+            return Long.toString(view_count/1000000000)+"B views";
+        }else if(view_count>=1000000){
+            return Long.toString(view_count/1000000)+"M views";
+        }else if(view_count>=1000){
+            return Long.toString(view_count/1000)+"K views";
+        }else {
+            return Long.toString(view_count)+" views";
+        }
     }
 
 }

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe;
 
 import android.content.Intent;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
@@ -10,8 +11,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.crawler.ServiceList;
+import org.schabi.newpipe.crawler.StreamingService;
 
 
 /**
@@ -44,7 +45,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_videoitem_detail);
-
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
         // Show the Up button in the action bar.
         try {
             //noinspection ConstantConditions
@@ -70,9 +71,9 @@ public class VideoItemDetailActivity extends AppCompatActivity {
             if (getIntent().getData() != null) {
                 videoUrl = getIntent().getData().toString();
                 StreamingService[] serviceList = ServiceList.getServices();
-                //VideoExtractor videoExtractor = null;
+                //StreamExtractor videoExtractor = null;
                 for (int i = 0; i < serviceList.length; i++) {
-                    if (serviceList[i].acceptUrl(videoUrl)) {
+                    if (serviceList[i].getUrlIdHandler().acceptUrl(videoUrl)) {
                         arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
                         currentStreamingService = i;
                         //videoExtractor = ServiceList.getService(i).getExtractorInstance();
@@ -80,7 +81,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                     }
                 }
                 if(currentStreamingService == -1) {
-                    Toast.makeText(this, R.string.urlNotSupportedText, Toast.LENGTH_LONG)
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
                             .show();
                 }
                 //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
@@ -89,7 +90,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
 
                 arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
                         PreferenceManager.getDefaultSharedPreferences(this)
-                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
+                                .getBoolean(getString(R.string.autoplay_through_intent_key), false));
             } else {
                 videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
                 currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
@@ -113,6 +114,12 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                 .commit();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);

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

@@ -1,49 +1,59 @@
 package org.schabi.newpipe;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Point;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.view.MenuItem;
+import android.widget.Toast;
+
+import java.io.IOException;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
 import java.util.Vector;
 
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.services.ServiceList;
-import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.crawler.MediaFormat;
+import org.schabi.newpipe.crawler.ParsingException;
+import org.schabi.newpipe.crawler.ServiceList;
+import org.schabi.newpipe.crawler.StreamExtractor;
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.crawler.StreamingService;
+import org.schabi.newpipe.crawler.VideoInfo;
+import org.schabi.newpipe.crawler.services.youtube.YoutubeStreamExtractor;
 
 
 /**
@@ -67,27 +77,36 @@ import org.schabi.newpipe.services.StreamingService;
 public class VideoItemDetailFragment extends Fragment {
 
     private static final String TAG = VideoItemDetailFragment.class.toString();
+    private static final String KORE_PACKET = "org.xbmc.kore";
 
     /**
      * The fragment argument representing the item ID that this fragment
      * represents.
      */
-    public static final String ARG_ITEM_ID = "item_id";
     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;
     private ActionBarHandler actionBarHandler;
+    private ProgressBar progressBar;
+
+    private int streamingServiceId = -1;
 
     private boolean autoPlayEnabled = false;
-    private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
+    private Bitmap videoThumbnail;
 
     private View thumbnailWindowLayout;
     private FloatingActionButton playVideoButton;
     private final Point initialThumbnailPos = new Point(0, 0);
 
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+
     public interface OnInvokeCreateOptionsMenuListener {
         void createOptionsMenu();
     }
@@ -96,7 +115,7 @@ public class VideoItemDetailFragment extends Fragment {
 
     private class VideoExtractorRunnable implements Runnable {
         private final Handler h = new Handler();
-        private VideoExtractor videoExtractor;
+        private StreamExtractor streamExtractor;
         private final StreamingService service;
         private final String videoUrl;
 
@@ -104,38 +123,46 @@ public class VideoItemDetailFragment extends Fragment {
             this.service = service;
             this.videoUrl = videoUrl;
         }
+
         @Override
         public void run() {
             try {
-                this.videoExtractor = service.getExtractorInstance(videoUrl);
-                VideoInfo videoInfo = videoExtractor.getVideoInfo();
+                streamExtractor = service.getExtractorInstance(videoUrl, new Downloader());
+                VideoInfo videoInfo = VideoInfo.getVideoInfo(streamExtractor, new Downloader());
+
                 h.post(new VideoResultReturnedRunnable(videoInfo));
-                if (videoInfo.videoAvailableStatus == VideoInfo.VIDEO_AVAILABLE) {
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.VIDEO_THUMBNAIL));
-                    h.post(new SetThumbnailRunnable(
-                            BitmapFactory.decodeStream(
-                                    new URL(videoInfo.uploader_thumbnail_url)
-                                            .openConnection()
-                                            .getInputStream()),
-                            SetThumbnailRunnable.CHANNEL_THUMBNAIL));
-                    if(showNextVideoItem) {
-                        h.post(new SetThumbnailRunnable(
-                                BitmapFactory.decodeStream(
-                                        new URL(videoInfo.nextVideo.thumbnail_url)
-                                                .openConnection()
-                                                .getInputStream()),
-                                SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL));
-                    }
-                }
-            } catch (Exception e) {
+            } catch (IOException e) {
+                postNewErrorToast(h, R.string.network_error);
+                e.printStackTrace();
+            }
+            // custom service related exceptions
+            catch (YoutubeStreamExtractor.DecryptException de) {
+                postNewErrorToast(h, R.string.youtube_signature_decryption_error);
+                de.printStackTrace();
+            } catch (YoutubeStreamExtractor.GemaException ge) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onErrorBlockedByGema();
+                    }
+                });
+            }
+            // ----------------------------------------
+            catch(StreamExtractor.ContentNotAvailableException e) {
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onNotSpecifiedContentError();
+                    }
+                });
+                e.printStackTrace();
+            } catch (ParsingException e) {
+                postNewErrorToast(h, e.getMessage());
+                e.printStackTrace();
+            } catch(Exception e) {
+                postNewErrorToast(h, R.string.general_error);
                 e.printStackTrace();
             }
-
         }
     }
 
@@ -152,173 +179,418 @@ public class VideoItemDetailFragment extends Fragment {
         }
     }
 
-    private class SetThumbnailRunnable implements Runnable {
-        public static final int VIDEO_THUMBNAIL = 1;
-        public static final int CHANNEL_THUMBNAIL = 2;
-        public static final int NEXT_VIDEO_THUMBNAIL = 3;
-        private final Bitmap thumbnail;
-        private final int thumbnailId;
-        public SetThumbnailRunnable(Bitmap thumbnail, int id) {
-            this.thumbnail = thumbnail;
-            this.thumbnailId = id;
-        }
+    private class ThumbnailLoadingListener implements ImageLoadingListener {
         @Override
-        public void run() {
-            updateThumbnail(thumbnail, thumbnailId);
+        public void onLoadingStarted(String imageUri, View view) {}
+
+        @Override
+        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+            Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                    R.string.could_not_load_thumbnails, Toast.LENGTH_LONG).show();
+            failReason.getCause().printStackTrace();
         }
+
+        @Override
+        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {}
+
+        @Override
+        public void onLoadingCancelled(String imageUri, View view) {}
     }
 
-    private void updateThumbnail(Bitmap thumbnail, int id) {
-        Activity a = getActivity();
-        ImageView thumbnailView;
-        try {
-            switch (id) {
-                case SetThumbnailRunnable.VIDEO_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
-                    break;
-                case SetThumbnailRunnable.CHANNEL_THUMBNAIL:
-                    thumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
-                    break;
-                case SetThumbnailRunnable.NEXT_VIDEO_THUMBNAIL:
-                    FrameLayout nextVideoFrame = (FrameLayout) a.findViewById(R.id.detailNextVideoFrame);
-                    thumbnailView = (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
-                    currentVideoInfo.nextVideo.thumbnail = thumbnail;
-                    break;
-                default:
-                    Log.d(TAG, "Error: Thumbnail id not known");
-                    return;
-            }
-
-            if (thumbnailView != null) {
-                thumbnailView.setImageBitmap(thumbnail);
-            }
-
-        } catch (java.lang.NullPointerException e) {
-            // Not good program design, I know. :/
-            Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
-        }
-    }
-
-    private void updateInfo(VideoInfo info) {
-        currentVideoInfo = info;
-        Resources res = activity.getResources();
+    private void updateInfo(final VideoInfo info) {
         try {
+            Context c = getContext();
             VideoInfoItemViewCreator videoItemViewCreator =
                     new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
 
-            RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
-            ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
-            TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
+            RelativeLayout textContentLayout =
+                    (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
+            final TextView videoTitleView =
+                    (TextView) activity.findViewById(R.id.detailVideoTitleView);
             TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
             TextView viewCountView = (TextView) activity.findViewById(R.id.detailViewCountView);
             TextView thumbsUpView = (TextView) activity.findViewById(R.id.detailThumbsUpCountView);
-            TextView thumbsDownView = (TextView) activity.findViewById(R.id.detailThumbsDownCountView);
+            TextView thumbsDownView =
+                    (TextView) activity.findViewById(R.id.detailThumbsDownCountView);
             TextView uploadDateView = (TextView) activity.findViewById(R.id.detailUploadDateView);
             TextView descriptionView = (TextView) activity.findViewById(R.id.detailDescriptionView);
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            FrameLayout nextVideoFrame = (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
+            FrameLayout nextVideoFrame =
+                    (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
             RelativeLayout nextVideoRootFrame =
                     (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
-            View nextVideoView = videoItemViewCreator
-                    .getViewByVideoInfoItem(null, nextVideoFrame, info.nextVideo);
-            nextVideoFrame.addView(nextVideoView);
             Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
+            TextView similarTitle = (TextView) activity.findViewById(R.id.detailSimilarTitle);
+            Button backgroundButton = (Button)
+                    activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
+            View topView = activity.findViewById(R.id.detailTopView);
+            View nextVideoView = videoItemViewCreator
+                    .getViewFromVideoInfoItem(null, nextVideoFrame, info.next_video, getContext());
+
+            progressBar.setVisibility(View.GONE);
+            nextVideoFrame.addView(nextVideoView);
+
+            initThumbnailViews(info, nextVideoFrame);
 
             textContentLayout.setVisibility(View.VISIBLE);
             playVideoButton.setVisibility(View.VISIBLE);
-            progressBar.setVisibility(View.GONE);
-            if(!showNextVideoItem) {
+            if (!showNextVideoItem) {
                 nextVideoRootFrame.setVisibility(View.GONE);
-                similarVideosButton.setVisibility(View.GONE);
+                similarTitle.setVisibility(View.GONE);
             }
 
-            switch (info.videoAvailableStatus) {
-                case VideoInfo.VIDEO_AVAILABLE: {
-                    videoTitleView.setText(info.title);
-                    uploaderView.setText(info.uploader);
+            videoTitleView.setText(info.title);
 
-                    Locale locale = getPreferredLocale();
-                    NumberFormat nf = NumberFormat.getInstance(locale);
-                    String localisedViewCount = nf.format(info.view_count);
-                    viewCountView.setText(
-                            String.format(
-                                    res.getString(R.string.viewCountText), localisedViewCount));
-
-
-                    thumbsUpView.setText(nf.format(info.like_count));
-                    thumbsDownView.setText(nf.format(info.dislike_count));
-
-                    @SuppressLint("SimpleDateFormat")
-                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-                    Date datum = null;
-                    try {
-                        datum = formatter.parse(info.upload_date);
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
-
-                    DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
-
-                    String localisedDate = df.format(datum);
-                    uploadDateView.setText(
-                            String.format(res.getString(R.string.uploadDateText), localisedDate));
-                    descriptionView.setText(Html.fromHtml(info.description));
-                    descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-
-                    actionBarHandler.setVideoInfo(info.webpage_url, info.title);
-                    actionBarHandler.setStartPosition(info.startPosition);
-
-                    // parse streams
-                    Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
-                    for (VideoInfo.VideoStream i : info.videoStreams) {
-                        if (useStream(i, streamsToUse)) {
-                            streamsToUse.add(i);
+            topView.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == android.view.MotionEvent.ACTION_UP) {
+                        ImageView arrow = (ImageView) activity.findViewById(R.id.toggleDescriptionView);
+                        View extra = activity.findViewById(R.id.detailExtraView);
+                        if (extra.getVisibility() == View.VISIBLE) {
+                            extra.setVisibility(View.GONE);
+                            arrow.setImageResource(R.drawable.arrow_down);
+                        } else {
+                            extra.setVisibility(View.VISIBLE);
+                            arrow.setImageResource(R.drawable.arrow_up);
                         }
                     }
-                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
-                    for (int i = 0; i < streamList.length; i++) {
-                        streamList[i] = streamsToUse.get(i);
-                    }
-                    actionBarHandler.setStreams(streamList, info.audioStreams);
+                    return true;
                 }
+            });
 
-                nextVideoButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent detailIntent =
-                                new Intent(getActivity(), VideoItemDetailActivity.class);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
-                        //todo: make id dynamic the following line is crap
-                        detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, 0);
-                        startActivity(detailIntent);
-                    }
-                });
-                break;
-                case VideoInfo.VIDEO_UNAVAILABLE_GEMA:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.gruese_die_gema_unangebracht));
-                    break;
-                case VideoInfo.VIDEO_UNAVAILABLE:
-                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.not_available_monkey));
-                    break;
-                default:
-                    Log.e(TAG, "Video Available Status not known.");
+            uploaderView.setText(info.uploader);
+            videoTitleView.setText(info.title);
+            uploaderView.setText(info.uploader);
+            viewCountView.setText(Localization.localizeViewCount(info.view_count, c));
+            thumbsUpView.setText(Localization.localizeNumber(info.like_count, c));
+            thumbsDownView.setText(Localization.localizeNumber(info.dislike_count, c));
+            uploadDateView.setText(Localization.localizeDate(info.upload_date, c));
+            descriptionView.setText(Html.fromHtml(info.description));
+
+            descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
+
+            // parse streams
+            Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
+            for (VideoInfo.VideoStream i : info.video_streams) {
+                if (useStream(i, streamsToUse)) {
+                    streamsToUse.add(i);
+                }
             }
 
+            nextVideoButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent detailIntent =
+                            new Intent(getActivity(), VideoItemDetailActivity.class);
+                        /*detailIntent.putExtra(
+                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id); */
+                    detailIntent.putExtra(
+                            VideoItemDetailFragment.VIDEO_URL, info.next_video.webpage_url);
+                    detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+                    startActivity(detailIntent);
+                }
+            });
+            textContentLayout.setVisibility(View.VISIBLE);
+
+            initSimilarVideos(info, videoItemViewCreator);
+
             if(autoPlayEnabled) {
-                actionBarHandler.playVideo();
+                playVideo(info);
             }
+
+            playVideoButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    playVideo(info);
+                }
+            });
+
+            backgroundButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    playVideo(info);
+                }
+            });
+
+            setupActionBarHandler(info);
         } catch (java.lang.NullPointerException e) {
             Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
             e.printStackTrace();
         }
     }
 
+    private void initThumbnailViews(VideoInfo info, View nextVideoFrame) {
+        ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+        ImageView uploaderThumb
+                = (ImageView) activity.findViewById(R.id.detailUploaderThumbnailView);
+        ImageView nextVideoThumb =
+                (ImageView) nextVideoFrame.findViewById(R.id.itemThumbnailView);
+
+        imageLoader.displayImage(info.thumbnail_url, videoThumbnailView,
+                displayImageOptions, new ImageLoadingListener() {
+                    @Override
+                    public void onLoadingStarted(String imageUri, View view) {
+                    }
+
+                    @Override
+                    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+                        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                                R.string.could_not_load_thumbnails, Toast.LENGTH_LONG).show();
+                        failReason.getCause().printStackTrace();
+                    }
+
+                    @Override
+                    public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+                        videoThumbnail = loadedImage;
+                    }
+
+                    @Override
+                    public void onLoadingCancelled(String imageUri, View view) {
+                    }
+                });
+        imageLoader.displayImage(info.uploader_thumbnail_url,
+                uploaderThumb, displayImageOptions, new ThumbnailLoadingListener());
+        imageLoader.displayImage(info.next_video.thumbnail_url,
+                nextVideoThumb, displayImageOptions, new ThumbnailLoadingListener());
+    }
+
+    private void setupActionBarHandler(final VideoInfo info) {
+        actionBarHandler.setupStreamList(info.video_streams);
+
+        actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, info.webpage_url);
+                intent.setType("text/plain");
+                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+            }
+        });
+
+        actionBarHandler.setOnOpenInBrowserListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(info.webpage_url));
+
+                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.choose_browser)));
+            }
+        });
+
+        actionBarHandler.setOnPlayWithKodiListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setPackage(KORE_PACKET);
+                    intent.setData(Uri.parse(info.webpage_url.replace("https", "http")));
+                    activity.startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                    builder.setMessage(R.string.kore_not_found)
+                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent intent = new Intent();
+                                    intent.setAction(Intent.ACTION_VIEW);
+                                    intent.setData(Uri.parse(activity.getString(R.string.fdroid_kore_url)));
+                                    activity.startActivity(intent);
+                                }
+                            })
+                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+
+                                }
+                            });
+                    builder.create().show();
+                }
+            }
+        });
+
+        actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                //VideoInfo.VideoStream selectedStreamItem = videoStreams.get(selectedStream);
+                VideoInfo.AudioStream audioStream =
+                        info.audio_streams.get(getPreferredAudioStreamId(info));
+                VideoInfo.VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
+                String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
+                String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
+                Bundle args = new Bundle();
+                args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
+                args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
+                args.putString(DownloadDialog.TITLE, info.title);
+                args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
+                args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
+                DownloadDialog downloadDialog = new DownloadDialog();
+                downloadDialog.setArguments(args);
+                downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
+            }
+        });
+
+        actionBarHandler.setOnPlayAudioListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                boolean useExternalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
+                        .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
+                Intent intent;
+                VideoInfo.AudioStream audioStream =
+                        info.audio_streams.get(getPreferredAudioStreamId(info));
+                if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
+                    //internal music player: explicit intent
+                    if (!BackgroundPlayer.isRunning  && videoThumbnail != null) {
+                        ActivityCommunicator.getCommunicator()
+                                .backgroundPlayerThumbnail = videoThumbnail;
+                        intent = new Intent(activity, BackgroundPlayer.class);
+
+                        intent.setAction(Intent.ACTION_VIEW);
+                        Log.i(TAG, "audioStream is null:" + (audioStream == null));
+                        Log.i(TAG, "audioStream.url is null:" + (audioStream.url == null));
+                        intent.setDataAndType(Uri.parse(audioStream.url),
+                                MediaFormat.getMimeById(audioStream.format));
+                        intent.putExtra(BackgroundPlayer.TITLE, info.title);
+                        intent.putExtra(BackgroundPlayer.WEB_URL, info.webpage_url);
+                        intent.putExtra(BackgroundPlayer.SERVICE_ID, streamingServiceId);
+                        intent.putExtra(BackgroundPlayer.CHANNEL_NAME, info.uploader);
+                        activity.startService(intent);
+                    }
+                } else {
+                    intent = new Intent();
+                    try {
+                        intent.setAction(Intent.ACTION_VIEW);
+                        intent.setDataAndType(Uri.parse(audioStream.url),
+                                MediaFormat.getMimeById(audioStream.format));
+                        intent.putExtra(Intent.EXTRA_TITLE, info.title);
+                        intent.putExtra("title", info.title);
+                        // HERE !!!
+                        activity.startActivity(intent);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                        builder.setMessage(R.string.no_player_found)
+                                .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Intent intent = new Intent();
+                                        intent.setAction(Intent.ACTION_VIEW);
+                                        intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
+                                        activity.startActivity(intent);
+                                    }
+                                })
+                                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Log.i(TAG, "You unlocked a secret unicorn.");
+                                    }
+                                });
+                        builder.create().show();
+                        Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
+    private int getPreferredAudioStreamId(final VideoInfo info) {
+        String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getString(activity.getString(R.string.default_audio_format_key), "webm");
+
+        int preferredFormat = MediaFormat.WEBMA.id;
+        switch(preferredFormatString) {
+            case "webm":
+                preferredFormat = MediaFormat.WEBMA.id;
+                break;
+            case "m4a":
+                preferredFormat = MediaFormat.M4A.id;
+                break;
+            default:
+                break;
+        }
+
+        for(int i = 0; i < info.audio_streams.size(); i++) {
+            if(info.audio_streams.get(i).format == preferredFormat) {
+                return i;
+            }
+        }
+
+        //todo: make this a proper error
+        Log.e(TAG, "FAILED to set audioStream value!");
+        return 0;
+    }
+
+    private void initSimilarVideos(final VideoInfo info, VideoInfoItemViewCreator videoItemViewCreator) {
+        LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similarVideosView);
+        ArrayList<VideoPreviewInfo> similar = new ArrayList<>(info.related_videos);
+        for (final VideoPreviewInfo item : similar) {
+            View similarView = videoItemViewCreator
+                    .getViewFromVideoInfoItem(null, similarLayout, item, getContext());
+
+            similarView.setClickable(true);
+            similarView.setFocusable(true);
+            int[] attrs = new int[]{R.attr.selectableItemBackground};
+            TypedArray typedArray = activity.obtainStyledAttributes(attrs);
+            int backgroundResource = typedArray.getResourceId(0, 0);
+            similarView.setBackgroundResource(backgroundResource);
+            typedArray.recycle();
+
+            similarView.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    if (event.getAction() == MotionEvent.ACTION_UP) {
+                        Intent detailIntent = new Intent(activity, VideoItemDetailActivity.class);
+                        detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, item.webpage_url);
+                        detailIntent.putExtra(
+                                VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+                        startActivity(detailIntent);
+                        return true;
+                    }
+                    return false;
+                }
+            });
+
+            similarLayout.addView(similarView);
+            ImageView rthumb = (ImageView)similarView.findViewById(R.id.itemThumbnailView);
+            imageLoader.displayImage(item.thumbnail_url, rthumb,
+                    displayImageOptions, new ThumbnailLoadingListener());
+        }
+    }
+
+    private void onErrorBlockedByGema() {
+        Button backgroundButton = (Button)
+                activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+
+        progressBar.setVisibility(View.GONE);
+        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                getResources(), R.drawable.gruese_die_gema));
+        backgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(activity.getString(R.string.c3s_url)));
+                activity.startActivity(intent);
+            }
+        });
+
+        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
+    }
+
+    private void onNotSpecifiedContentError() {
+        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+        progressBar.setVisibility(View.GONE);
+        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
+                getResources(), R.drawable.not_available_monkey));
+        Toast.makeText(activity, R.string.content_not_available, Toast.LENGTH_LONG)
+                .show();
+    }
+
     private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
         for(VideoInfo.VideoStream i : streams) {
             if(i.resolution.equals(stream.resolution)) {
@@ -338,7 +610,7 @@ public class VideoItemDetailFragment extends Fragment {
         super.onCreate(savedInstanceState);
         activity = (AppCompatActivity) getActivity();
         showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(activity.getString(R.string.showNextVideo), true);
+                .getBoolean(activity.getString(R.string.show_next_video_key), true);
 
     }
 
@@ -346,6 +618,8 @@ public class VideoItemDetailFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
+        progressBar = (ProgressBar) rootView.findViewById(R.id.detailProgressBar);
+
         actionBarHandler = new ActionBarHandler(activity);
         actionBarHandler.setupNavMenu(activity);
         if(onInvokeCreateOptionsMenuListener != null) {
@@ -359,8 +633,7 @@ public class VideoItemDetailFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceBundle) {
         super.onActivityCreated(savedInstanceBundle);
         Activity a = getActivity();
-        playVideoButton =
-                (FloatingActionButton) a.findViewById(R.id.playVideoButton);
+        playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton);
         thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
         Button backgroundButton = (Button)
                 a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
@@ -370,8 +643,8 @@ public class VideoItemDetailFragment extends Fragment {
         // Otherwise the applications would crash.
         if(playVideoButton != null) {
             try {
-                StreamingService streamingService = ServiceList.getService(
-                        getArguments().getInt(STREAMING_SERVICE));
+                streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
+                StreamingService streamingService = ServiceList.getService(streamingServiceId);
                 Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
                         getArguments().getString(VIDEO_URL), streamingService));
 
@@ -381,95 +654,81 @@ public class VideoItemDetailFragment extends Fragment {
                 e.printStackTrace();
             }
 
-            if (PreferenceManager.getDefaultSharedPreferences(getActivity())
-                    .getBoolean(getString(R.string.leftHandLayout), false) && checkIfLandscape()) {
-                RelativeLayout.LayoutParams oldLayout =
-                        (RelativeLayout.LayoutParams) playVideoButton.getLayoutParams();
-                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
-                        RelativeLayout.LayoutParams.WRAP_CONTENT,
-                        RelativeLayout.LayoutParams.WRAP_CONTENT);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-                layoutParams.setMargins(oldLayout.leftMargin, oldLayout.topMargin,
-                        oldLayout.rightMargin, oldLayout.bottomMargin);
-                playVideoButton.setLayoutParams(layoutParams);
+            // todo: Fix this workaround (probably with a better design), so that older android
+            // versions don't have problems rendering the thumbnail right.
+            if(Build.VERSION.SDK_INT >= 18) {
+                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+                    // inside the ScrollView with the actual size of the thumbnail.
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                               int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        RelativeLayout.LayoutParams newWindowLayoutParams =
+                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                        newWindowLayoutParams.height = bottom - top;
+                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+
+                        //noinspection SuspiciousNameCombination
+                        initialThumbnailPos.set(top, left);
+
+                    }
+                });
             }
-
-            playVideoButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            backgroundButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    actionBarHandler.playVideo();
-                }
-            });
-
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
-            similarVideosButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Intent intent = new Intent(activity, VideoItemListActivity.class);
-                    //todo: find more elegant way to do this - converting from List to ArrayList sucks
-                    ArrayList<VideoPreviewInfo> toParcel = new ArrayList<>(currentVideoInfo.relatedVideos);
-                    //why oh why does the parcelable array put method have to be so damn specific
-                    // about the class of its argument?
-                    //why not a List<? extends Parcelable>?
-                    intent.putParcelableArrayListExtra(VideoItemListActivity.VIDEO_INFO_ITEMS, toParcel);
-                    activity.startActivity(intent);
-                }
-            });
-
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                // This is used to synchronize the thumbnailWindowButton and the playVideoButton
-                // inside the ScrollView with the actual size of the thumbnail.
-                @Override
-                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                    RelativeLayout.LayoutParams newWindowLayoutParams =
-                            (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                    newWindowLayoutParams.height = bottom - top;
-                    thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
-
-
-                    //noinspection SuspiciousNameCombination
-                    initialThumbnailPos.set(top, left);
-
-                }
-            });
         }
     }
 
-    /**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences.
-     * Currently not affected by the device's locale.*/
-    private Locale getPreferredLocale() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-        String languageKey = getContext().getString(R.string.searchLanguage);
-        //i know the following line defaults languageCode to "en", but java is picky about uninitialised values
-        // Schabi: well lint tels me the value is redundant. I'll suppress it for now.
-        @SuppressWarnings("UnusedAssignment")
-        String languageCode = "en";
-        languageCode = sp.getString(languageKey, "en");
+    public void playVideo(final VideoInfo info) {
+        // ----------- THE MAGIC MOMENT ---------------
+        VideoInfo.VideoStream selectedVideoStream =
+                info.video_streams.get(actionBarHandler.getSelectedVideoStream());
 
-        if(languageCode.length() == 2) {
-            return new Locale(languageCode);
-        }
-        else if(languageCode.contains("_")) {
-            String country = languageCode
-                    .substring(languageCode.indexOf("_"), languageCode.length());
-            return new Locale(languageCode.substring(0, 2), country);
-        }
-        return Locale.getDefault();
-    }
+        if (PreferenceManager.getDefaultSharedPreferences(activity)
+                .getBoolean(activity.getString(R.string.use_external_video_player_key), false)) {
 
-    private boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+            // External Player
+            Intent intent = new Intent();
+            try {
+                intent.setAction(Intent.ACTION_VIEW);
+
+                intent.setDataAndType(Uri.parse(selectedVideoStream.url),
+                        MediaFormat.getMimeById(selectedVideoStream.format));
+                intent.putExtra(Intent.EXTRA_TITLE, info.title);
+                intent.putExtra("title", info.title);
+
+                activity.startActivity(intent);      // HERE !!!
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                builder.setMessage(R.string.no_player_found)
+                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent();
+                                intent.setAction(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
+                                activity.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+
+                            }
+                        });
+                builder.create().show();
+            }
+        } else {
+            // Internal Player
+            Intent intent = new Intent(activity, PlayVideoActivity.class);
+            intent.putExtra(PlayVideoActivity.VIDEO_TITLE, info.title);
+            intent.putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.url);
+            intent.putExtra(PlayVideoActivity.VIDEO_URL, info.webpage_url);
+            intent.putExtra(PlayVideoActivity.START_POSITION, info.start_position);
+            activity.startActivity(intent);     //also HERE !!!
+        }
+
+        // --------------------------------------------
     }
 
     @Override
@@ -485,4 +744,24 @@ public class VideoItemDetailFragment extends Fragment {
     public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
         this.onInvokeCreateOptionsMenuListener = listener;
     }
+
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                        stringResource, Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+
+    private void postNewErrorToast(Handler h, final String message) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(VideoItemDetailFragment.this.getActivity(),
+                        message, Toast.LENGTH_LONG).show();
+            }
+        });
+    }
 }

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

@@ -2,7 +2,9 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 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.support.v7.widget.SearchView;
@@ -15,7 +17,8 @@ import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
-import org.schabi.newpipe.services.ServiceList;
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.crawler.ServiceList;
 
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -111,7 +114,7 @@ public class VideoItemListActivity extends AppCompatActivity
         //------ todo: remove this line when multiservice support is implemented ------
         currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
         //-----------------------------------------------------------------------------
-
+        //to solve issue 38
         listFragment = (VideoItemListFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.videoitem_list);
         listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));
@@ -171,7 +174,13 @@ public class VideoItemListActivity extends AppCompatActivity
             }
         }
 
-        SettingsActivity.initSettings(this);
+        PreferenceManager.setDefaultValues(this, R.xml.settings, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
     }
 
     /**
@@ -190,7 +199,7 @@ public class VideoItemListActivity extends AppCompatActivity
             // adding or replacing the detail fragment using a
             // fragment transaction.
             Bundle arguments = new Bundle();
-            arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
+            //arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
             arguments.putString(VideoItemDetailFragment.VIDEO_URL, webpage_url);
             arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
             videoFragment = new VideoItemDetailFragment();
@@ -209,7 +218,7 @@ public class VideoItemListActivity extends AppCompatActivity
             // In single-pane mode, simply start the detail activity
             // for the selected item ID.
             Intent detailIntent = new Intent(this, VideoItemDetailActivity.class);
-            detailIntent.putExtra(VideoItemDetailFragment.ARG_ITEM_ID, id);
+            //detailIntent.putExtra(VideoItemDetailFragment.ARG_ITEM_ID, id);
             detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, webpage_url);
             detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
             startActivity(detailIntent);

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

@@ -9,17 +9,21 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 import java.util.Vector;
 
-import org.schabi.newpipe.services.SearchEngine;
-import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.crawler.CrawlingException;
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+import org.schabi.newpipe.crawler.SearchEngine;
+import org.schabi.newpipe.crawler.StreamingService;
 
 
 /**
@@ -57,12 +61,15 @@ public class VideoItemListFragment extends ListFragment {
 
     private Thread searchThread = null;
     private SearchRunnable searchRunnable = null;
-    private Thread loadThumbsThread = null;
-    private LoadThumbsRunnable loadThumbsRunnable = null;
     // used to track down if results posted by threads ar still valid
     private int currentRequestId = -1;
     private ListView list;
 
+    private View footer;
+
+    // used to suppress request for loading a new page while another page is already loading.
+    private boolean loadingNextPage = true;
+
     private class ResultRunnable implements Runnable {
         private final SearchEngine.Result result;
         private final int requestId;
@@ -73,6 +80,9 @@ public class VideoItemListFragment extends ListFragment {
         @Override
         public void run() {
             updateListOnResult(result, requestId);
+            if (android.os.Build.VERSION.SDK_INT >= 19) {
+                getListView().removeFooterView(footer);
+            }
         }
     }
 
@@ -81,7 +91,7 @@ public class VideoItemListFragment extends ListFragment {
         private final String query;
         private final int page;
         final Handler h = new Handler();
-        private volatile boolean run = true;
+        private volatile boolean runs = true;
         private final int requestId;
         public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
             this.engine = engine;
@@ -90,31 +100,36 @@ public class VideoItemListFragment extends ListFragment {
             this.requestId = requestId;
         }
         void terminate() {
-            run = false;
+            runs = false;
         }
         @Override
         public void run() {
             try {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-                String searchLanguageKey = getContext().getString(R.string.searchLanguage);
-                String searchLanguage = sp.getString(searchLanguageKey, "en");
-                SearchEngine.Result result = engine.search(query, page, searchLanguage);
+                String searchLanguageKey = getContext().getString(R.string.search_language_key);
+                String searchLanguage = sp.getString(searchLanguageKey,
+                        getString(R.string.default_language_value));
+                SearchEngine.Result result = engine.search(query, page, searchLanguage,
+                        new Downloader());
+
                 Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
-                if(run) {
+                if(runs) {
                     h.post(new ResultRunnable(result, requestId));
                 }
-            } catch(Exception e) {
+            } catch(IOException e) {
+                postNewErrorToast(h, R.string.network_error);
+                e.printStackTrace();
+            } catch(CrawlingException ce) {
+                postNewErrorToast(h, R.string.parsing_error);
+                ce.printStackTrace();
+            } catch(Exception e) {
+                postNewErrorToast(h, R.string.general_error);
                 e.printStackTrace();
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Toast.makeText(getActivity(), "Network Error", Toast.LENGTH_SHORT).show();
-                    }
-                });
             }
         }
     }
-
+/*
+<<<
     private class LoadThumbsRunnable implements Runnable {
         private final Vector<String> thumbnailUrlList = new Vector<>();
         private final Vector<Boolean> downloadedList;
@@ -141,6 +156,7 @@ public class VideoItemListFragment extends ListFragment {
                 if(!downloadedList.get(i)) {
                     Bitmap thumbnail;
                     try {
+                        //todo: make bitmaps not bypass tor
                         thumbnail = BitmapFactory.decodeStream(
                                 new URL(thumbnailUrlList.get(i)).openConnection().getInputStream());
                         h.post(new SetThumbnailRunnable(i, thumbnail, requestId));
@@ -170,6 +186,9 @@ public class VideoItemListFragment extends ListFragment {
         }
     }
 
+=======
+>>>>>>> 6d1b4652fc98e5c2d5e19b0f98ba38a731137a70
+*/
     public void present(List<VideoPreviewInfo> videoList) {
         mode = PRESENT_VIDEOS_MODE;
         setListShown(true);
@@ -185,12 +204,15 @@ public class VideoItemListFragment extends ListFragment {
         videoListAdapter.clearVideoList();
         setListShown(false);
         startSearch(query, lastPage);
+        //todo: Somehow this command is not working on older devices,
+        // although it was introduced with API level 8. Test this and find a solution.
         getListView().smoothScrollToPosition(0);
     }
 
     private void nextPage() {
+        loadingNextPage = true;
         lastPage++;
-        Log.d(TAG, getString(R.string.searchPage) + Integer.toString(lastPage));
+        Log.d(TAG, getString(R.string.search_page) + Integer.toString(lastPage));
         startSearch(query, lastPage);
     }
 
@@ -214,7 +236,7 @@ public class VideoItemListFragment extends ListFragment {
                 Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
             } else {
                 if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.didYouMean) + result.suggestion + " ?",
+                    Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
                             Toast.LENGTH_LONG).show();
                 }
                 updateList(result.resultList);
@@ -226,26 +248,16 @@ public class VideoItemListFragment extends ListFragment {
         try {
             videoListAdapter.addVideoList(list);
             terminateThreads();
-            loadThumbsRunnable = new LoadThumbsRunnable(videoListAdapter.getVideoList(),
-                    videoListAdapter.getDownloadedThumbnailList(), currentRequestId);
-            loadThumbsThread = new Thread(loadThumbsRunnable);
-            loadThumbsThread.start();
         } catch(java.lang.IllegalStateException e) {
             Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
         } catch(Exception e) {
             e.printStackTrace();
+        } finally {
+            loadingNextPage = false;
         }
     }
 
     private void terminateThreads() {
-        if(loadThumbsRunnable != null && loadThumbsRunnable.isRunning()) {
-            loadThumbsRunnable.terminate();
-            try {
-                loadThumbsThread.join();
-            } catch(Exception e) {
-                e.printStackTrace();
-            }
-        }
         if(searchThread != null) {
             searchRunnable.terminate();
             // No need to join, since we don't really terminate the thread. We just demand
@@ -283,6 +295,10 @@ public class VideoItemListFragment extends ListFragment {
         super.onViewCreated(view, savedInstanceState);
         list = getListView();
         videoListAdapter = new VideoListAdapter(getActivity(), this);
+        footer = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE))
+                .inflate(R.layout.paginate_footer, null, false);
+
+
         setListAdapter(videoListAdapter);
 
         // Restore the previously serialized activated item position.
@@ -292,6 +308,7 @@ public class VideoItemListFragment extends ListFragment {
             setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
         }
 
+
         getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
             long lastScrollDate = 0;
 
@@ -300,14 +317,17 @@ public class VideoItemListFragment extends ListFragment {
             }
 
             @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+            public void onScroll(AbsListView view, int firstVisibleItem,
+                                 int visibleItemCount, int totalItemCount) {
                 if (mode != PRESENT_VIDEOS_MODE
                         && list.getChildAt(0) != null
                         && list.getLastVisiblePosition() == list.getAdapter().getCount() - 1
                         && list.getChildAt(list.getChildCount() - 1).getBottom() <= list.getHeight()) {
                     long time = System.currentTimeMillis();
-                    if ((time - lastScrollDate) > 200) {
+                    if ((time - lastScrollDate) > 200
+                            && !loadingNextPage) {
                         lastScrollDate = time;
+                        getListView().addFooterView(footer);
                         nextPage();
                     }
                 }
@@ -357,4 +377,14 @@ public class VideoItemListFragment extends ListFragment {
         mActivatedPosition = position;
     }
 
+    private void postNewErrorToast(Handler h, final int stringResource) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                setListShown(true);
+                Toast.makeText(getActivity(), getString(R.string.network_error),
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 }

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

@@ -1,7 +1,6 @@
 package org.schabi.newpipe;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,6 +8,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+
 import java.util.List;
 import java.util.Vector;
 
@@ -33,30 +34,26 @@ import java.util.Vector;
  */
 
 class VideoListAdapter extends BaseAdapter {
-
     private final Context context;
     private final VideoInfoItemViewCreator viewCreator;
     private Vector<VideoPreviewInfo> videoList = new Vector<>();
-    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
     private final ListView listView;
 
     public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
         viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
         this.listView = videoListFragment.getListView();
+        this.listView.setDivider(null);
+        this.listView.setDividerHeight(0);
         this.context = context;
     }
 
     public void addVideoList(List<VideoPreviewInfo> videos) {
         videoList.addAll(videos);
-        for(int i = 0; i < videos.size(); i++) {
-            downloadedThumbnailList.add(false);
-        }
         notifyDataSetChanged();
     }
 
     public void clearVideoList() {
         videoList = new Vector<>();
-        downloadedThumbnailList = new Vector<>();
         notifyDataSetChanged();
     }
 
@@ -64,20 +61,6 @@ class VideoListAdapter extends BaseAdapter {
         return videoList;
     }
 
-    public void updateDownloadedThumbnailList(int index) {
-        downloadedThumbnailList.set(index, true);
-    }
-
-    public Vector<Boolean> getDownloadedThumbnailList() {
-        return downloadedThumbnailList;
-    }
-
-    public void setThumbnail(int index, Bitmap thumbnail) {
-        videoList.get(index).thumbnail = thumbnail;
-        downloadedThumbnailList.set(index, true);
-        notifyDataSetChanged();
-    }
-
     @Override
     public int getCount() {
         return videoList.size();
@@ -95,10 +78,10 @@ class VideoListAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));
+        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position), context);
 
         if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
+            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.light_youtube_primary_color));
         } else {
             convertView.setBackgroundColor(0);
         }

app/src/main/java/org/schabi/newpipe/crawler/AbstractVideoInfo.java

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.crawler;
+
+import android.graphics.Bitmap;
+
+/**
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * AbstractVideoInfo.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 VideoInfo and VideoPreviewInfo.*/
+public abstract class AbstractVideoInfo {
+    public String id = "";
+    public String title = "";
+    public String uploader = "";
+    public String thumbnail_url = "";
+    public Bitmap thumbnail = null;
+    public String webpage_url = "";
+    public String upload_date = "";
+    public long view_count = -1;
+}

app/src/main/java/org/schabi/newpipe/crawler/CrawlingException.java

@@ -0,0 +1,37 @@
+package org.schabi.newpipe.crawler;
+
+/**
+ * Created by Christian Schabesberger on 30.01.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * CrawlingException.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 CrawlingException extends Exception {
+    public CrawlingException() {}
+
+    public CrawlingException(String message) {
+        super(message);
+    }
+
+    public CrawlingException(Throwable cause) {
+        super(cause);
+    }
+
+    public CrawlingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -0,0 +1,105 @@
+package org.schabi.newpipe.crawler;
+
+import android.util.Xml;
+
+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 {
+
+    static class DashMpdParsingException extends ParsingException {
+        DashMpdParsingException(String message, Exception e) {
+            super(message, e);
+        }
+    }
+
+    public static List<VideoInfo.AudioStream> getAudioStreams(String dashManifestUrl,
+                                                             Downloader downloader)
+            throws DashMpdParsingException {
+        String dashDoc;
+        try {
+            dashDoc = downloader.download(dashManifestUrl);
+        } catch(IOException ioe) {
+            throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
+        }
+        Vector<VideoInfo.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 VideoInfo.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/crawler/Downloader.java

@@ -0,0 +1,41 @@
+package org.schabi.newpipe.crawler;
+
+import java.io.IOException;
+
+/**
+ * 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;
+
+    /**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;
+}

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

@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.crawler;
 
 /**
  * Created by Adam Howard on 08/11/15.
@@ -6,7 +6,7 @@ package org.schabi.newpipe;
  * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
  *     and Adam Howard <achdisposable1@gmail.com> 2015
  *
- * VideoListAdapter.java is part of NewPipe.
+ * 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
@@ -25,10 +25,12 @@ package org.schabi.newpipe;
 /**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");
 

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

@@ -0,0 +1,60 @@
+package org.schabi.newpipe.crawler;
+
+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 {
+
+    public static class RegexException extends ParsingException {
+        public RegexException(String message) {
+            super(message);
+        }
+    }
+
+    public static String matchGroup1(String pattern, String input) throws RegexException {
+        Pattern pat = Pattern.compile(pattern);
+        Matcher mat = pat.matcher(input);
+        boolean foundMatch = mat.find();
+        if (foundMatch) {
+            return mat.group(1);
+        }
+        else {
+            //Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
+            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[] split_arg = arg.split("=");
+            map.put(split_arg[0], URLDecoder.decode(split_arg[1], "UTF-8"));
+        }
+        return map;
+    }
+}

app/src/main/java/org/schabi/newpipe/crawler/ParsingException.java

@@ -0,0 +1,35 @@
+package org.schabi.newpipe.crawler;
+
+/**
+ * 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 CrawlingException {
+    public ParsingException() {}
+    public ParsingException(String message) {
+        super(message);
+    }
+    public ParsingException(Throwable cause) {
+        super(cause);
+    }
+    public ParsingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

app/src/main/java/org/schabi/newpipe/crawler/SearchEngine.java

@@ -1,8 +1,8 @@
-package org.schabi.newpipe.services;
-
-import org.schabi.newpipe.VideoPreviewInfo;
+package org.schabi.newpipe.crawler;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -27,16 +27,16 @@ import java.util.Vector;
 
 @SuppressWarnings("ALL")
 public interface SearchEngine {
-
-
     class Result {
         public String errorMessage = "";
         public String suggestion = "";
-        public final Vector<VideoPreviewInfo> resultList = new Vector<>();
+        public final List<VideoPreviewInfo> resultList = new Vector<>();
     }
 
-    ArrayList<String> suggestionList(String query);
+    ArrayList<String> suggestionList(String query, Downloader dl)
+            throws CrawlingException, IOException;
 
     //Result search(String query, int page);
-    Result search(String query, int page, String contentCountry);
+    Result search(String query, int page, String contentCountry, Downloader dl)
+            throws CrawlingException, IOException;
 }

app/src/main/java/org/schabi/newpipe/crawler/ServiceList.java

@@ -1,8 +1,8 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.crawler;
 
 import android.util.Log;
 
-import org.schabi.newpipe.services.youtube.YoutubeService;
+import org.schabi.newpipe.crawler.services.youtube.YoutubeService;
 
 /**
  * Created by Christian Schabesberger on 23.08.15.
@@ -26,6 +26,7 @@ import org.schabi.newpipe.services.youtube.YoutubeService;
 
 /**Provides access to the video streaming services supported by NewPipe.
  * Currently only Youtube until the API becomes more stable.*/
+
 @SuppressWarnings("ALL")
 public class ServiceList {
     private static final String TAG = ServiceList.class.toString();

app/src/main/java/org/schabi/newpipe/crawler/StreamExtractor.java

@@ -0,0 +1,78 @@
+package org.schabi.newpipe.crawler;
+
+/**
+ * Created by Christian Schabesberger on 10.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <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 java.util.List;
+
+/**Scrapes information from a video streaming service (eg, YouTube).*/
+
+
+@SuppressWarnings("ALL")
+public interface StreamExtractor {
+
+    public class ExctractorInitException extends CrawlingException {
+        public ExctractorInitException() {}
+        public ExctractorInitException(String message) {
+            super(message);
+        }
+        public ExctractorInitException(Throwable cause) {
+            super(cause);
+        }
+        public ExctractorInitException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    public class ContentNotAvailableException extends ParsingException {
+        public ContentNotAvailableException() {}
+        public ContentNotAvailableException(String message) {
+            super(message);
+        }
+        public ContentNotAvailableException(Throwable cause) {
+            super(cause);
+        }
+        public ContentNotAvailableException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    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 int getLength() throws ParsingException;
+    public abstract long getViews() throws ParsingException;
+    public abstract String getUploadDate() throws ParsingException;
+    public abstract String getThumbnailUrl() throws ParsingException;
+    public abstract String getUploaderThumbnailUrl() throws ParsingException;
+    public abstract List<VideoInfo.AudioStream> getAudioStreams() throws ParsingException;
+    public abstract List<VideoInfo.VideoStream> getVideoStreams() throws ParsingException;
+    public abstract List<VideoInfo.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 VideoPreviewInfo getNextVideo() throws ParsingException;
+    public abstract List<VideoPreviewInfo> getRelatedVideos() throws ParsingException;
+    public abstract VideoUrlIdHandler getUrlIdConverter();
+    public abstract String getPageUrl();
+}

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

@@ -1,4 +1,6 @@
-package org.schabi.newpipe.services;
+package org.schabi.newpipe.crawler;
+
+import java.io.IOException;
 
 /**
  * Created by Christian Schabesberger on 23.08.15.
@@ -25,11 +27,11 @@ public interface StreamingService {
         public String name = "";
     }
     ServiceInfo getServiceInfo();
-    VideoExtractor getExtractorInstance(String url);
+    StreamExtractor getExtractorInstance(String url, Downloader downloader)
+            throws IOException, CrawlingException;
     SearchEngine getSearchEngineInstance();
 
-    /**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 callean through ACTIONs.*/
-    boolean acceptUrl(String videoUrl);
+    VideoUrlIdHandler getUrlIdHandler();
+
+
 }

app/src/main/java/org/schabi/newpipe/crawler/VideoInfo.java

@@ -0,0 +1,191 @@
+package org.schabi.newpipe.crawler;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 26.08.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoInfo.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 VideoInfo extends AbstractVideoInfo {
+
+    /**Fills out the video info fields which are common to all services.
+     * Probably needs to be overridden by subclasses*/
+    public static VideoInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
+            throws CrawlingException, IOException {
+        VideoInfo videoInfo = new VideoInfo();
+
+        VideoUrlIdHandler uiconv = extractor.getUrlIdConverter();
+
+
+        videoInfo.webpage_url = extractor.getPageUrl();
+        videoInfo.title = extractor.getTitle();
+        videoInfo.duration = extractor.getLength();
+        videoInfo.uploader = extractor.getUploader();
+        videoInfo.description = extractor.getDescription();
+        videoInfo.view_count = extractor.getViews();
+        videoInfo.upload_date = extractor.getUploadDate();
+        videoInfo.thumbnail_url = extractor.getThumbnailUrl();
+        videoInfo.id = uiconv.getVideoId(extractor.getPageUrl());
+        //todo: make this quick and dirty solution a real fallback
+        // The front end should be notified that the dash mpd could not be downloaded
+        // although not getting the dash mpd is not the end of the world, therfore
+        // we continue.
+        try {
+            videoInfo.dashMpdUrl = extractor.getDashMpdUrl();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        /** Load and extract audio*/
+        videoInfo.audio_streams = extractor.getAudioStreams();
+        if(videoInfo.dashMpdUrl != null && !videoInfo.dashMpdUrl.isEmpty()) {
+            if(videoInfo.audio_streams == null) {
+                videoInfo.audio_streams = new Vector<AudioStream>();
+            }
+            //todo: make this quick and dirty solution a real fallback
+            // same as the quick and dirty aboth
+            try {
+                videoInfo.audio_streams.addAll(
+                        DashMpdParser.getAudioStreams(videoInfo.dashMpdUrl, downloader));
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        }
+        /** Extract video stream url*/
+        videoInfo.video_streams = extractor.getVideoStreams();
+        /** Extract video only stream url*/
+        videoInfo.video_only_streams = extractor.getVideoOnlyStreams();
+        videoInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
+        videoInfo.start_position = extractor.getTimeStamp();
+        videoInfo.average_rating = extractor.getAverageRating();
+        videoInfo.like_count = extractor.getLikeCount();
+        videoInfo.dislike_count = extractor.getDislikeCount();
+        videoInfo.next_video = extractor.getNextVideo();
+        videoInfo.related_videos = extractor.getRelatedVideos();
+
+        //Bitmap thumbnail = null;
+        //Bitmap uploader_thumbnail = null;
+        //int videoAvailableStatus = VIDEO_AVAILABLE;
+        return videoInfo;
+    }
+
+
+    public String uploader_thumbnail_url = "";
+    public String description = "";
+    /*todo: make this lists over vectors*/
+    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;
+
+    /*YouTube-specific fields
+    todo: move these to a subclass*/
+    public int age_limit = 0;
+    public int like_count = -1;
+    public int dislike_count = -1;
+    public String average_rating = "";
+    public VideoPreviewInfo next_video = null;
+    public List<VideoPreviewInfo> related_videos = null;
+    //in seconds. some metadata is not passed using a VideoInfo object!
+    public int start_position = 0;
+    //todo: public int service_id = -1;
+
+    public VideoInfo() {}
+
+    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
+     * All the shared properties are copied to the new VideoInfo.*/
+    @SuppressWarnings("WeakerAccess")
+    public VideoInfo(AbstractVideoInfo avi) {
+        this.id = avi.id;
+        this.title = avi.title;
+        this.uploader = avi.uploader;
+        this.thumbnail_url = avi.thumbnail_url;
+        this.thumbnail = avi.thumbnail;
+        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 VideoPreviewInfo) {
+            //shitty String to convert code
+            String dur = ((VideoPreviewInfo)avi).duration;
+            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
+            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
+            this.duration = (minutes*60)+seconds;
+        }
+    }
+
+    public static 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 equalStats(cmp)
+                    && url == cmp.url;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    public static 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 wether two streams are the same, but have diferent urls
+        public boolean equalStats(AudioStream cmp) {
+            return format == cmp.format
+                    && bandwidth == cmp.bandwidth
+                    && sampling_rate == cmp.sampling_rate;
+        }
+
+        // revelas wether two streams are equal
+        public boolean equals(AudioStream cmp) {
+            return equalStats(cmp)
+                    && url == cmp.url;
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/crawler/VideoPreviewInfo.java

@@ -1,10 +1,10 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.crawler;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.schabi.newpipe.services.AbstractVideoInfo;
+import org.schabi.newpipe.crawler.AbstractVideoInfo;
 
 /**
  * Created by Christian Schabesberger on 26.08.15.

app/src/main/java/org/schabi/newpipe/crawler/VideoUrlIdHandler.java

@@ -0,0 +1,32 @@
+package org.schabi.newpipe.crawler;
+
+/**
+ * Created by Christian Schabesberger on 02.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * VideoUrlIdHandler.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 VideoUrlIdHandler {
+    String getVideoUrl(String videoId);
+    String getVideoId(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/crawler/services/youtube/YoutubeSearchEngine.java

@@ -0,0 +1,209 @@
+package org.schabi.newpipe.crawler.services.youtube;
+
+import android.net.Uri;
+import android.util.Log;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.schabi.newpipe.crawler.Downloader;
+import org.schabi.newpipe.crawler.ParsingException;
+import org.schabi.newpipe.crawler.SearchEngine;
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+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.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * 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 implements SearchEngine {
+
+    private static final String TAG = YoutubeSearchEngine.class.toString();
+
+    @Override
+    public Result search(String query, int page, String languageCode, Downloader downloader)
+            throws IOException, ParsingException {
+        Result result = new Result();
+        Uri.Builder builder = new Uri.Builder();
+        builder.scheme("https")
+                .authority("www.youtube.com")
+                .appendPath("results")
+                .appendQueryParameter("search_query", query)
+                .appendQueryParameter("page", Integer.toString(page))
+                .appendQueryParameter("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);
+        }
+
+        try {
+
+            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)) {
+                    result.suggestion = el.select("a").first().text();
+                    // search message item
+                } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
+                    result.errorMessage = el.text();
+
+                    // video item type
+                } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
+                    VideoPreviewInfo resultItem = new VideoPreviewInfo();
+                    Element dl = el.select("h3").first().select("a").first();
+                    resultItem.webpage_url = dl.attr("abs:href");
+                    try {
+                        Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
+                        Matcher m = p.matcher(resultItem.webpage_url);
+                        resultItem.id = m.group(1);
+                    } catch (Exception e) {
+                        //e.printStackTrace();
+                    }
+                    resultItem.title = dl.text();
+
+                    resultItem.duration = item.select("span[class=\"video-time\"]").first().text();
+
+                    resultItem.uploader = item.select("div[class=\"yt-lockup-byline\"]").first()
+                            .select("a").first()
+                            .text();
+                    resultItem.upload_date = item.select("div[class=\"yt-lockup-meta\"]").first()
+                            .select("li").first()
+                            .text();
+
+                    //todo: test against view_count
+                    String viewCountInfo = item.select("div[class=\"yt-lockup-meta\"]").first()
+                            .select("li").get(1)
+                            .text();
+                    viewCountInfo = viewCountInfo.substring(0, viewCountInfo.indexOf(' '));
+                    viewCountInfo = viewCountInfo.replaceAll("[,.]", "");
+                    resultItem.view_count = Long.parseLong(viewCountInfo);
+
+                    Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
+                            .select("img").first();
+                    resultItem.thumbnail_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 (resultItem.thumbnail_url.contains(".gif")) {
+                        resultItem.thumbnail_url = te.attr("abs:data-thumb");
+                    }
+                    result.resultList.add(resultItem);
+                } else {
+                    //noinspection ConstantConditions
+                    Log.e(TAG, "unexpected element found:\"" + el + "\"");
+                }
+            }
+        } catch(Exception e) {
+            throw new ParsingException(e);
+        }
+        return result;
+    }
+
+    @Override
+    public ArrayList<String> suggestionList(String query, Downloader dl)
+            throws IOException, ParsingException {
+
+        ArrayList<String> suggestions = new ArrayList<>();
+
+        Uri.Builder builder = new Uri.Builder();
+        builder.scheme("https")
+                .authority("suggestqueries.google.com")
+                .appendPath("complete")
+                .appendPath("search")
+                .appendQueryParameter("client", "")
+                .appendQueryParameter("output", "toolbar")
+                .appendQueryParameter("ds", "yt")
+                .appendQueryParameter("q", query);
+        String url = builder.build().toString();
+
+
+        String response = dl.download(url);
+
+        try {
+
+            //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("utf-8"))));
+                doc.getDocumentElement().normalize();
+            } catch (ParserConfigurationException | SAXException | IOException e) {
+                e.printStackTrace();
+            }
+
+            if (doc != null) {
+                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"));
+                    }
+                }
+            } else {
+                Log.e(TAG, "GREAT FUCKING ERROR");
+            }
+            return suggestions;
+        } catch(Exception e) {
+            throw new ParsingException(e);
+        }
+    }
+
+}

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

@@ -1,8 +1,13 @@
-package org.schabi.newpipe.services.youtube;
+package org.schabi.newpipe.crawler.services.youtube;
 
-import org.schabi.newpipe.services.StreamingService;
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.services.SearchEngine;
+import org.schabi.newpipe.crawler.CrawlingException;
+import org.schabi.newpipe.crawler.Downloader;
+import org.schabi.newpipe.crawler.StreamExtractor;
+import org.schabi.newpipe.crawler.StreamingService;
+import org.schabi.newpipe.crawler.VideoUrlIdHandler;
+import org.schabi.newpipe.crawler.SearchEngine;
+
+import java.io.IOException;
 
 
 /**
@@ -33,9 +38,11 @@ public class YoutubeService implements StreamingService {
         return serviceInfo;
     }
     @Override
-    public VideoExtractor getExtractorInstance(String url) {
-        if(acceptUrl(url)) {
-            return new YoutubeVideoExtractor(url);
+    public StreamExtractor getExtractorInstance(String url, Downloader downloader)
+            throws CrawlingException, IOException {
+        VideoUrlIdHandler urlIdHandler = new YoutubeVideoUrlIdHandler();
+        if(urlIdHandler.acceptUrl(url)) {
+            return new YoutubeStreamExtractor(url, downloader) ;
         }
         else {
             throw new IllegalArgumentException("supplied String is not a valid Youtube URL");
@@ -45,9 +52,9 @@ public class YoutubeService implements StreamingService {
     public SearchEngine getSearchEngineInstance() {
         return new YoutubeSearchEngine();
     }
+
     @Override
-    public boolean acceptUrl(String videoUrl) {
-        return videoUrl.contains("youtube") ||
-                videoUrl.contains("youtu.be");
+    public VideoUrlIdHandler getUrlIdHandler() {
+        return new YoutubeVideoUrlIdHandler();
     }
 }

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

@@ -0,0 +1,711 @@
+package org.schabi.newpipe.crawler.services.youtube;
+
+import android.provider.MediaStore;
+import android.util.Log;
+
+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.crawler.CrawlingException;
+import org.schabi.newpipe.crawler.Downloader;
+import org.schabi.newpipe.crawler.Parser;
+import org.schabi.newpipe.crawler.ParsingException;
+import org.schabi.newpipe.crawler.VideoUrlIdHandler;
+import org.schabi.newpipe.crawler.StreamExtractor;
+import org.schabi.newpipe.crawler.MediaFormat;
+import org.schabi.newpipe.crawler.VideoInfo;
+import org.schabi.newpipe.crawler.VideoPreviewInfo;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+/**
+ * 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 implements StreamExtractor {
+
+    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 = null;
+        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");
+    }
+
+    // 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 nececeary for the url aboth
+    private static final String EL_INFO = "el=info";
+
+    public class DecryptException extends ParsingException {
+        DecryptException(Throwable cause) {
+            super(cause);
+        }
+        DecryptException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    // special content not available exceptions
+
+    public class GemaException extends ContentNotAvailableException {
+        GemaException(String message) {
+            super(message);
+        }
+    }
+
+    // ----------------
+
+    private static final String TAG = YoutubeStreamExtractor.class.toString();
+    private final Document doc;
+    private JSONObject playerArgs;
+    private Map<String, String> videoInfoPage;
+
+    // static values
+    private static final String DECRYPTION_FUNC_NAME="decrypt";
+
+    // cached values
+    private static volatile String decryptionCode = "";
+
+    VideoUrlIdHandler urlidhandler = new YoutubeVideoUrlIdHandler();
+    String pageUrl = "";
+
+    private Downloader downloader;
+
+    public YoutubeStreamExtractor(String pageUrl, Downloader dl) throws CrawlingException, IOException {
+        //most common videoInfo fields are now set in our superclass, for all services
+        downloader = dl;
+        this.pageUrl = pageUrl;
+        String pageContent = downloader.download(urlidhandler.cleanUrl(pageUrl));
+        doc = Jsoup.parse(pageContent, pageUrl);
+        String ytPlayerConfigRaw;
+        JSONObject ytPlayerConfig;
+
+        //attempt to load the youtube js player JSON arguments
+        try {
+            ytPlayerConfigRaw =
+                    Parser.matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContent);
+            ytPlayerConfig = new JSONObject(ytPlayerConfigRaw);
+            playerArgs = ytPlayerConfig.getJSONObject("args");
+        } catch (Parser.RegexException e) {
+            String errorReason = findErrorReason(doc);
+            switch(errorReason) {
+                case "GEMA":
+                    throw new GemaException(errorReason);
+                case "":
+                    throw new ParsingException("player config empty", e);
+                default:
+                    throw new ContentNotAvailableException("Content not available", e);
+            }
+        } catch (JSONException e) {
+            throw new ParsingException("Could not parse yt player config");
+        }
+
+
+        // get videoInfo page
+        try {
+            //Parser.unescapeEntities(url_data_str, true).split("&")
+            String getVideoInfoUrl = GET_VIDEO_INFO_URL.replace("%%video_id%%",
+                    urlidhandler.getVideoId(pageUrl)).replace("$$el_type$$", "&" + EL_INFO);
+            videoInfoPage = Parser.compatParseMap(downloader.download(getVideoInfoUrl));
+        } catch(Exception e) {
+            throw new ParsingException("Could not load video info page.", e);
+        }
+
+        //----------------------------------
+        // load and parse description code, if it isn't already initialised
+        //----------------------------------
+        if (decryptionCode.isEmpty()) {
+            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.
+                JSONObject ytAssets = ytPlayerConfig.getJSONObject("assets");
+                String playerUrl = ytAssets.getString("js");
+
+                if (playerUrl.startsWith("//")) {
+                    playerUrl = "https:" + playerUrl;
+                }
+                decryptionCode = loadDecryptionCode(playerUrl);
+            } catch (JSONException e) {
+                throw new ParsingException(
+                        "Could not load decryption code for the Youtube service.", e);
+            }
+        }
+    }
+
+    @Override
+    public String getTitle() throws ParsingException {
+        try {//json player args method
+            return playerArgs.getString("title");
+        } catch(JSONException je) {//html <meta> method
+            je.printStackTrace();
+            Log.w(TAG, "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 {//json player args method
+            return playerArgs.getString("author");
+        } catch(JSONException je) {
+            je.printStackTrace();
+            Log.w(TAG,
+                    "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 {
+            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 getViews() 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 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) {
+            Log.w(TAG, "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);
+        }
+    }
+
+    @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 dashManifest = playerArgs.getString("dashmpd");
+            if(!dashManifest.contains("/signature/")) {
+                String encryptedSig = Parser.matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
+                String decryptedSig;
+
+                decryptedSig = decryptSignature(encryptedSig, decryptionCode);
+                dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
+            }
+
+            return dashManifest;
+        } catch(JSONException je) {
+            throw new ParsingException(
+                    "Could not find \"dashmpd\" upon the player args (maybe no dash manifest available).", je);
+        } catch (Exception e) {
+            throw new ParsingException(e);
+        }
+        */
+        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);
+        }
+    }
+
+
+    @Override
+    public List<VideoInfo.AudioStream> getAudioStreams() throws ParsingException {
+        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+        try{
+            String encoded_url_map = playerArgs.getString("adaptive_fmts");
+            for(String url_data_str : encoded_url_map.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 VideoInfo.AudioStream(streamUrl,
+                                itagItem.mediaFormatId,
+                                itagItem.bandWidth,
+                                itagItem.samplingRate));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new ParsingException("Could not get audiostreams", e);
+        }
+        return audioStreams;
+    }
+
+    @Override
+    public List<VideoInfo.VideoStream> getVideoStreams() throws ParsingException {
+        Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
+
+        try{
+            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
+            for(String url_data_str : encoded_url_map.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 VideoInfo.VideoStream(
+                                    streamUrl,
+                                    itagItem.mediaFormatId,
+                                    itagItem.resolutionString));
+                        }
+                    }
+                } catch (Exception e) {
+                    Log.w(TAG, "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<VideoInfo.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{1,3})", 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));
+
+                int ret = seconds + (60 * minutes) + (3600 * hours);//don't trust BODMAS!
+                //Log.d(TAG, "derived timestamp value:"+ret);
+                return 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 {
+        // Not yet implemented.
+        // Also you need to be logged in to see age restricted videos on youtube,
+        // therefore NP is not able to receive such videos.
+        return 0;
+    }
+
+    @Override
+    public String getAverageRating() throws ParsingException {
+        try {
+            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 {
+            likesString = doc.select("button.like-button-renderer-like-button").first()
+                    .select("span.yt-uix-button-content").first().text();
+            return Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
+        } 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 {
+            dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
+                    .select("span.yt-uix-button-content").first().text();
+            return Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
+        } 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 VideoPreviewInfo 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 Vector<VideoPreviewInfo> getRelatedVideos() throws ParsingException {
+        try {
+            Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
+            for (Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
+                // first check if we have a playlist. If so leave them out
+                if (li.select("a[class*=\"content-link\"]").first() != null) {
+                    relatedVideos.add(extractVideoPreviewInfo(li));
+                }
+            }
+            return relatedVideos;
+        } catch(Exception e) {
+            throw new ParsingException("Could not get related videos", e);
+        }
+    }
+
+    @Override
+    public VideoUrlIdHandler getUrlIdConverter() {
+        return new YoutubeVideoUrlIdHandler();
+    }
+
+    @Override
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    /**Provides information about links to other videos on the video page, such as related videos.
+     * This is encapsulated in a VideoPreviewInfo object,
+     * which is a subset of the fields in a full VideoInfo.*/
+    private VideoPreviewInfo extractVideoPreviewInfo(Element li) throws ParsingException {
+        VideoPreviewInfo info = new VideoPreviewInfo();
+
+        try {
+            info.webpage_url = li.select("a.content-link").first()
+                    .attr("abs:href");
+
+            info.id = Parser.matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
+
+            //todo: check NullPointerException causing
+            info.title = 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
+
+            //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 {
+                info.view_count = Long.parseLong(li.select("span.view-count")
+                        .first().text().replaceAll("[^\\d]", ""));
+            } catch (NullPointerException e) {//related videos sometimes have no view count
+                info.view_count = 0;
+            }
+            info.uploader = li.select("span.g-hovercard").first().text();
+
+            info.duration = li.select("span.video-time").first().text();
+
+            Element img = li.select("img").first();
+            info.thumbnail_url = 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 (info.thumbnail_url.contains(".gif")) {
+                info.thumbnail_url = img.attr("data-thumb");
+            }
+            if (info.thumbnail_url.startsWith("//")) {
+                info.thumbnail_url = "https:" + info.thumbnail_url;
+            }
+        } catch (Exception e) {
+            throw new ParsingException(e);
+        }
+        return info;
+    }
+
+    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 {
+            String playerCode = downloader.download(playerUrl);
+
+            decryptionFuncName =
+                    Parser.matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
+
+            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(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/crawler/services/youtube/YoutubeVideoUrlIdHandler.java

@@ -0,0 +1,68 @@
+package org.schabi.newpipe.crawler.services.youtube;
+
+import org.schabi.newpipe.crawler.Parser;
+import org.schabi.newpipe.crawler.ParsingException;
+import org.schabi.newpipe.crawler.VideoUrlIdHandler;
+
+/**
+ * Created by Christian Schabesberger on 02.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoUrlIdHandler.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 YoutubeVideoUrlIdHandler implements VideoUrlIdHandler {
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getVideoUrl(String videoId) {
+        return "https://www.youtube.com/watch?v=" + videoId;
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    @Override
+    public String getVideoId(String url) throws ParsingException {
+        String id;
+        String pat;
+
+        if(url.contains("youtube")) {
+            pat = "youtube\\.com/watch\\?v=([\\-a-zA-Z0-9_]{11})";
+        }
+        else if(url.contains("youtu.be")) {
+            pat = "youtu\\.be/([a-zA-Z0-9_-]{11})";
+        }
+        else {
+            throw new ParsingException("Error no suitable url: " + url);
+        }
+
+        id = Parser.matchGroup1(pat, url);
+        if(!id.isEmpty()){
+            //Log.i(TAG, "string \""+url+"\" matches!");
+            return id;
+        } else {
+            throw new ParsingException("Error could not parse url: " + url);
+        }
+    }
+
+    public String cleanUrl(String complexUrl) throws ParsingException {
+        return getVideoUrl(getVideoId(complexUrl));
+    }
+
+    @Override
+    public boolean acceptUrl(String videoUrl) {
+        return videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be");
+    }
+}

app/src/main/java/org/schabi/newpipe/services/AbstractVideoInfo.java

@@ -1,16 +0,0 @@
-package org.schabi.newpipe.services;
-
-import android.graphics.Bitmap;
-
-/**Common properties between VideoInfo and VideoPreviewInfo.*/
-public abstract class AbstractVideoInfo {
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    //public int duration = -1;
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String webpage_url = "";
-    public String upload_date = "";
-    public long view_count = -1;
-}

app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java

@@ -1,117 +0,0 @@
-package org.schabi.newpipe.services;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoExtractor.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.VideoInfo;
-
-/**Scrapes information from a video streaming service (eg, YouTube).*/
-@SuppressWarnings("ALL")
-public abstract class VideoExtractor {
-    protected final String pageUrl;
-    protected VideoInfo videoInfo;
-
-    @SuppressWarnings("WeakerAccess")
-    public VideoExtractor(String url) {
-        this.pageUrl = url;
-    }
-
-    /**Fills out the video info fields which are common to all services.
-     * Probably needs to be overridden by subclasses*/
-    public VideoInfo getVideoInfo()
-    {
-        if(videoInfo == null) {
-            videoInfo = new VideoInfo();
-        }
-
-        if(videoInfo.webpage_url.isEmpty()) {
-            videoInfo.webpage_url = pageUrl;
-        }
-
-        if(videoInfo.title.isEmpty()) {
-            videoInfo.title = getTitle();
-        }
-
-        if(videoInfo.duration  < 1) {
-            videoInfo.duration = getLength();
-        }
-
-
-        if(videoInfo.uploader.isEmpty()) {
-            videoInfo.uploader = getUploader();
-        }
-
-        if(videoInfo.description.isEmpty()) {
-            videoInfo.description = getDescription();
-        }
-
-        if(videoInfo.view_count == -1) {
-            videoInfo.view_count = getViews();
-        }
-
-        if(videoInfo.upload_date.isEmpty()) {
-            videoInfo.upload_date = getUploadDate();
-        }
-
-        if(videoInfo.thumbnail_url.isEmpty()) {
-            videoInfo.thumbnail_url = getThumbnailUrl();
-        }
-
-        if(videoInfo.id.isEmpty()) {
-            videoInfo.id = getVideoId(pageUrl);
-        }
-
-        /** Load and extract audio*/
-        if(videoInfo.audioStreams == null) {
-            videoInfo.audioStreams = getAudioStreams();
-        }
-        /** Extract video stream url*/
-        if(videoInfo.videoStreams == null) {
-            videoInfo.videoStreams = getVideoStreams();
-        }
-
-        if(videoInfo.uploader_thumbnail_url.isEmpty()) {
-            videoInfo.uploader_thumbnail_url = getUploaderThumbnailUrl();
-        }
-
-        if(videoInfo.startPosition < 0) {
-            videoInfo.startPosition = getTimeStamp();
-        }
-
-        //Bitmap thumbnail = null;
-        //Bitmap uploader_thumbnail = null;
-        //int videoAvailableStatus = VIDEO_AVAILABLE;
-        return videoInfo;
-    }
-
-    protected abstract String getVideoUrl(String videoId);
-    protected abstract String getVideoId(String siteUrl);
-    protected abstract int getTimeStamp();
-    protected abstract String getTitle();
-    protected abstract String getDescription();
-    protected abstract String getUploader();
-    protected abstract int getLength();
-    protected abstract int getViews();
-    protected abstract String getUploadDate();
-    protected abstract String getThumbnailUrl();
-    protected abstract String getUploaderThumbnailUrl();
-    protected abstract VideoInfo.AudioStream[] getAudioStreams();
-    protected abstract VideoInfo.VideoStream[] getVideoStreams();
-}

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

@@ -1,190 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.net.Uri;
-import android.util.Log;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.services.SearchEngine;
-import org.schabi.newpipe.VideoPreviewInfo;
-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.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * 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 implements SearchEngine {
-
-    private static final String TAG = YoutubeSearchEngine.class.toString();
-
-    @Override
-    public Result search(String query, int page, String languageCode) {
-        //String contentCountry = PreferenceManager.getDefaultSharedPreferences(this).getString(getString(R.string., "");
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("www.youtube.com")
-                .appendPath("results")
-                .appendQueryParameter("search_query", query)
-                .appendQueryParameter("page", Integer.toString(page))
-                .appendQueryParameter("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);
-        Result result = new Result();
-        Element list = doc.select("ol[class=\"item-section\"]").first();
-
-
-        int i = 0;
-        for(Element item : list.children()) {
-            i++;
-            /* 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)) {
-                result.suggestion = el.select("a").first().text();
-            // search message item
-            } else if(!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
-                result.errorMessage = el.text();
-
-            // video item type
-            } else if(!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
-                VideoPreviewInfo resultItem = new VideoPreviewInfo();
-                Element dl = el.select("h3").first().select("a").first();
-                resultItem.webpage_url = dl.attr("abs:href");
-                try {
-                    Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
-                    Matcher m = p.matcher(resultItem.webpage_url);
-                    resultItem.id=m.group(1);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                resultItem.title = dl.text();
-
-                resultItem.duration = item.select("span[class=\"video-time\"]").first().text();
-
-                resultItem.uploader = item.select("div[class=\"yt-lockup-byline\"]").first()
-                        .select("a").first()
-                        .text();
-                resultItem.upload_date = item.select("div[class=\"yt-lockup-meta\"]").first()
-                        .select("li").first()
-                        .text();
-                Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
-                        .select("img").first();
-                resultItem.thumbnail_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(resultItem.thumbnail_url.contains(".gif")) {
-                    resultItem.thumbnail_url = te.attr("abs:data-thumb");
-                }
-                result.resultList.add(resultItem);
-            } else {
-                //noinspection ConstantConditions
-                Log.e(TAG, "unexpected element found:\""+el+"\"");
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public ArrayList<String> suggestionList(String query) {
-
-        ArrayList<String> suggestions = new ArrayList<>();
-
-        Uri.Builder builder = new Uri.Builder();
-        builder.scheme("https")
-                .authority("suggestqueries.google.com")
-                .appendPath("complete")
-                .appendPath("search")
-                .appendQueryParameter("client", "")
-                .appendQueryParameter("output", "toolbar")
-                .appendQueryParameter("ds", "yt")
-                .appendQueryParameter("q", query);
-        String url = builder.build().toString();
-
-        String response = Downloader.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("utf-8"))));
-            doc.getDocumentElement().normalize();
-        }catch (ParserConfigurationException | SAXException | IOException e) {
-            e.printStackTrace();
-        }
-
-        if(doc!=null){
-            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"));
-                }
-            }
-        }else {
-            Log.e(TAG, "GREAT FUCKING ERROR");
-        }
-        return suggestions;
-    }
-
-}

app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java

@@ -1,610 +0,0 @@
-package org.schabi.newpipe.services.youtube;
-
-import android.util.Log;
-import android.util.Xml;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.parser.Parser;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.ScriptableObject;
-import org.schabi.newpipe.Downloader;
-import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.MediaFormat;
-import org.schabi.newpipe.VideoInfo;
-import org.schabi.newpipe.VideoPreviewInfo;
-import org.xmlpull.v1.XmlPullParser;
-
-import java.io.StringReader;
-import java.net.URLDecoder;
-import java.util.HashMap;
-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>
- * YoutubeVideoExtractor.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 YoutubeVideoExtractor extends VideoExtractor {
-
-    private static final String TAG = YoutubeVideoExtractor.class.toString();
-    private final Document doc;
-    private JSONObject jsonObj;
-    private JSONObject playerArgs;
-
-    // static values
-    private static final String DECRYPTION_FUNC_NAME="decrypt";
-
-    // cached values
-    private static volatile String decryptionCode = "";
-
-
-    public YoutubeVideoExtractor(String pageUrl) {
-        super(pageUrl);//most common videoInfo fields are now set in our superclass, for all services
-        String pageContents = Downloader.download(cleanUrl(pageUrl));
-        doc = Jsoup.parse(pageContents, pageUrl);
-
-        //attempt to load the youtube js player JSON arguments
-        try {
-            String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContents);
-            jsonObj = new JSONObject(jsonString);
-            playerArgs = jsonObj.getJSONObject("args");
-
-        } catch (Exception e) {//if this fails, the video is most likely not available.
-            // Determining why is done later.
-            videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
-            Log.d(TAG, "Could not load JSON data for Youtube video \""+pageUrl+"\". This most likely means the video is unavailable");
-        }
-
-        //----------------------------------
-        // load and parse description code, if it isn't already initialised
-        //----------------------------------
-        if (decryptionCode.isEmpty()) {
-            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.
-                JSONObject ytAssets = jsonObj.getJSONObject("assets");
-                String playerUrl = ytAssets.getString("js");
-
-                if (playerUrl.startsWith("//")) {
-                    playerUrl = "https:" + playerUrl;
-                }
-                decryptionCode = loadDecryptionCode(playerUrl);
-            } catch (Exception e){
-                Log.d(TAG, "Could not load decryption code for the Youtube service.");
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Override
-    public String getTitle() {
-        try {//json player args method
-            return playerArgs.getString("title");
-        } catch(JSONException je) {//html <meta> method
-            je.printStackTrace();
-            Log.w(TAG, "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) {
-            Log.e(TAG, "failed permanently to load title.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        try {
-            return doc.select("p[id=\"eow-description\"]").first().html();
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to load description.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getUploader() {
-        try {//json player args method
-            return playerArgs.getString("author");
-        } catch(JSONException je) {
-            je.printStackTrace();
-            Log.w(TAG, "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) {
-            e.printStackTrace();
-            Log.e(TAG, "failed permanently to load uploader name.");
-            return "";
-        }
-    }
-
-    @Override
-    public int getLength() {
-        try {
-            return playerArgs.getInt("length_seconds");
-        } catch (JSONException je) {//todo: find fallback method
-            Log.e(TAG, "failed to load video duration from JSON args");
-            je.printStackTrace();
-            return -1;
-        }
-    }
-
-    @Override
-    public int getViews() {
-        try {
-            String viewCountString = doc.select("meta[itemprop=interactionCount]").attr("content");
-            return Integer.parseInt(viewCountString);
-        } catch (Exception e) {//todo: find fallback method
-            Log.e(TAG, "failed to number of views");
-            e.printStackTrace();
-            return -1;
-        }
-    }
-
-    @Override
-    public String getUploadDate() {
-        try {
-            return doc.select("meta[itemprop=datePublished]").attr("content");
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to get upload date.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public String getThumbnailUrl() {
-        //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) {
-            Log.w(TAG, "Could not find high res Thumbnail. Using low res instead");
-            //fall through to fallback
-        } try {
-            return playerArgs.getString("thumbnail_url");
-        } catch (JSONException je) {
-            je.printStackTrace();
-            Log.w(TAG, "failed to extract thumbnail URL from JSON args; trying to extract it from HTML");
-            return "";
-        }
-    }
-
-    @Override
-    public String getUploaderThumbnailUrl() {
-        try {
-            return doc.select("a[class*=\"yt-user-photo\"]").first()
-                    .select("img").first()
-                    .attr("abs:data-thumb");
-        } catch (Exception e) {//todo: add fallback method
-            Log.e(TAG, "failed to get uploader thumbnail URL.");
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    @Override
-    public VideoInfo.AudioStream[] getAudioStreams() {
-        try {
-            String dashManifest = playerArgs.getString("dashmpd");
-            return parseDashManifest(dashManifest, decryptionCode);
-
-        } catch (NullPointerException e) {
-            Log.e(TAG, "Could not find \"dashmpd\" upon the player args (maybe no dash manifest available).");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new VideoInfo.AudioStream[0];
-    }
-
-    @Override
-    public VideoInfo.VideoStream[] getVideoStreams() {
-        try{
-            //------------------------------------
-            // extract video stream url
-            //------------------------------------
-            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
-            for(String url_data_str : encoded_url_map.split(",")) {
-                Map<String, String> tags = new HashMap<>();
-                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
-                    String[] split_tag = raw_tag.split("=");
-                    tags.put(split_tag[0], split_tag[1]);
-                }
-
-                int itag = Integer.parseInt(tags.get("itag"));
-                String streamUrl = URLDecoder.decode(tags.get("url"), "UTF-8");
-
-                // 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);
-                }
-
-                if(resolveFormat(itag) != -1) {
-                    videoStreams.add(new VideoInfo.VideoStream(
-                            streamUrl,
-                            resolveFormat(itag),
-                            resolveResolutionString(itag)));
-                }
-            }
-            return videoStreams.toArray(new VideoInfo.VideoStream[videoStreams.size()]);
-
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to get video stream");
-            e.printStackTrace();
-            return new VideoInfo.VideoStream[0];
-        }
-    }
-
-    /**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 */
-
-    @SuppressWarnings("WeakerAccess")
-    public static int resolveFormat(int itag) {
-        switch(itag) {
-            // video
-            case 17: return MediaFormat.v3GPP.id;
-            case 18: return MediaFormat.MPEG_4.id;
-            case 22: return MediaFormat.MPEG_4.id;
-            case 36: return MediaFormat.v3GPP.id;
-            case 37: return MediaFormat.MPEG_4.id;
-            case 38: return MediaFormat.MPEG_4.id;
-            case 43: return MediaFormat.WEBM.id;
-            case 44: return MediaFormat.WEBM.id;
-            case 45: return MediaFormat.WEBM.id;
-            case 46: return MediaFormat.WEBM.id;
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return -1;
-        }
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public static String resolveResolutionString(int itag) {
-        switch(itag) {
-            case 17: return "144p";
-            case 18: return "360p";
-            case 22: return "720p";
-            case 36: return "240p";
-            case 37: return "1080p";
-            case 38: return "1080p";
-            case 43: return "360p";
-            case 44: return "480p";
-            case 45: return "720p";
-            case 46: return "1080p";
-            default:
-                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
-        }
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    @Override
-    public String getVideoId(String url) {
-        String id;
-        String pat;
-
-        if(url.contains("youtube")) {
-            pat = "youtube\\.com/watch\\?v=([\\-a-zA-Z0-9_]{11})";
-        }
-        else if(url.contains("youtu.be")) {
-            pat = "youtu\\.be/([a-zA-Z0-9_-]{11})";
-        }
-        else {
-            Log.e(TAG, "Error could not parse url: " + url);
-            return "";
-        }
-        id = matchGroup1(pat, url);
-        if(!id.isEmpty()){
-            Log.i(TAG, "string \""+url+"\" matches!");
-            return id;
-        }
-        Log.i(TAG, "string \""+url+"\" does not match.");
-        return "";
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    @Override
-    public String getVideoUrl(String videoId) {
-        return "https://www.youtube.com/watch?v=" + videoId;
-    }
-
-    /**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(){
-        String timeStamp = matchGroup1("((#|&)t=\\d{0,3}h?\\d{0,3}m?\\d{1,3}s?)", pageUrl);
-
-        //TODO: test this
-        if(!timeStamp.isEmpty()) {
-            String secondsString = matchGroup1("(\\d{1,3})s", timeStamp);
-            String minutesString = matchGroup1("(\\d{1,3})m", timeStamp);
-            String hoursString = matchGroup1("(\\d{1,3})h", timeStamp);
-
-            if(secondsString.isEmpty()//if nothing was got,
-            && minutesString.isEmpty()//treat as unlabelled seconds
-            && hoursString.isEmpty())
-                secondsString = matchGroup1("t=(\\d{1,3})", 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));
-
-            int ret = seconds + (60*minutes) + (3600*hours);//don't trust BODMAS!
-            Log.d(TAG, "derived timestamp value:"+ret);
-            return ret;
-            //the ordering varies internationally
-        }//else, return default 0
-        return 0;
-    }
-
-    @Override
-    public VideoInfo getVideoInfo() {
-        videoInfo = super.getVideoInfo();
-        //todo: replace this with a call to getVideoId, if possible
-        videoInfo.id = matchGroup1("v=([0-9a-zA-Z_-]{11})", pageUrl);
-
-        videoInfo.age_limit = 0;
-
-        //average rating
-        try {
-            videoInfo.average_rating = playerArgs.getString("avg_rating");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        //---------------------------------------
-        // extracting information from html page
-        //---------------------------------------
-
-        // Determine what went wrong when the Video is not available
-        if(videoInfo.videoAvailableStatus == VideoInfo.VIDEO_UNAVAILABLE) {
-            if(doc.select("h1[id=\"unavailable-message\"]").first().text().contains("GEMA")) {
-                videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE_GEMA;
-            }
-        }
-
-        String likesString = "";
-        String dislikesString = "";
-        try {
-            // likes
-            likesString = doc.select("button.like-button-renderer-like-button").first()
-                    .select("span.yt-uix-button-content").first().text();
-            videoInfo.like_count = Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
-            // dislikes
-            dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
-                            .select("span.yt-uix-button-content").first().text();
-
-            videoInfo.dislike_count = Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
-        } catch(NumberFormatException nfe) {
-            Log.e(TAG, "failed to parse likesString \""+likesString+"\" and dislikesString \""+
-            dislikesString+"\" as integers");
-        } catch(Exception e) {
-            // if it fails we know that the video does not offer dislikes.
-            e.printStackTrace();
-            videoInfo.like_count = 0;
-            videoInfo.dislike_count = 0;
-        }
-
-        // next video
-        videoInfo.nextVideo = extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                .select("li").first());
-
-        // related videos
-        Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
-        for(Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
-            // first check if we have a playlist. If so leave them out
-            if(li.select("a[class*=\"content-link\"]").first() != null) {
-                relatedVideos.add(extractVideoPreviewInfo(li));
-            }
-        }
-        //todo: replace conversion
-        videoInfo.relatedVideos = relatedVideos;
-        //videoInfo.relatedVideos = relatedVideos.toArray(new VideoPreviewInfo[relatedVideos.size()]);
-        return videoInfo;
-    }
-
-
-    private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
-        if(!dashManifest.contains("/signature/")) {
-            String encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
-            String decryptedSig;
-
-            decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
-            dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
-        }
-        String dashDoc = Downloader.download(dashManifest);
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
-        try {
-            XmlPullParser parser = Xml.newPullParser();
-            parser.setInput(new StringReader(dashDoc));
-            int eventType = parser.getEventType();
-            String tagName = "";
-            String currentMimeType = "";
-            int currentBandwidth = -1;
-            int currentSamplingRate = -1;
-            boolean currentTagIsBaseUrl = false;
-            while(eventType != XmlPullParser.END_DOCUMENT) {
-                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:
-                        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 VideoInfo.AudioStream(parser.getText(),
-                                    format, currentBandwidth, currentSamplingRate));
-                        }
-                    case XmlPullParser.END_TAG:
-                        if(tagName.equals("AdaptationSet")) {
-                            currentMimeType = "";
-                        } else if(tagName.equals("BaseURL")) {
-                            currentTagIsBaseUrl = false;
-                        }
-                        break;
-                    default:
-                }
-                eventType = parser.next();
-            }
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-        return audioStreams.toArray(new VideoInfo.AudioStream[audioStreams.size()]);
-    }
-    /**Provides information about links to other videos on the video page, such as related videos.
-     * This is encapsulated in a VideoPreviewInfo object,
-     * which is a subset of the fields in a full VideoInfo.*/
-    private VideoPreviewInfo extractVideoPreviewInfo(Element li) {
-        VideoPreviewInfo info = new VideoPreviewInfo();
-        info.webpage_url = li.select("a.content-link").first()
-                .attr("abs:href");
-        try {
-            info.id = matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        //todo: check NullPointerException causing
-        info.title = 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
-        String views = li.select("span.view-count").first().text();
-        Log.i(TAG, "title:"+info.title);
-        Log.i(TAG, "view count:"+views);
-        try {
-            info.view_count = Long.parseLong(li.select("span.view-count")
-                    .first().text().replaceAll("[^\\d]", ""));
-        } catch (NullPointerException e) {//related videos sometimes have no view count
-            info.view_count = 0;
-        }
-        info.uploader = li.select("span.g-hovercard").first().text();
-
-        info.duration = li.select("span.video-time").first().text();
-
-        Element img = li.select("img").first();
-        info.thumbnail_url = 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(info.thumbnail_url.contains(".gif")) {
-            info.thumbnail_url = img.attr("data-thumb");
-        }
-        if(info.thumbnail_url.startsWith("//")) {
-            info.thumbnail_url = "https:" + info.thumbnail_url;
-        }
-        return info;
-    }
-
-    private String loadDecryptionCode(String playerUrl) {
-        String playerCode = Downloader.download(playerUrl);
-        String decryptionFuncName = "";
-        String decryptionFunc = "";
-        String helperObjectName;
-        String helperObject = "";
-        String callerFunc = "function " + DECRYPTION_FUNC_NAME + "(a){return %%(a);}";
-        String decryptionCode;
-
-        try {
-            decryptionFuncName = matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
-
-            String functionPattern = "(var "+  decryptionFuncName.replace("$", "\\$") +"=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            decryptionFunc = matchGroup1(functionPattern, playerCode);
-            decryptionFunc += ";";
-
-            helperObjectName = matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
-
-            String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)";
-            helperObject = matchGroup1(helperPattern, playerCode);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        callerFunc = callerFunc.replace("%%", decryptionFuncName);
-        decryptionCode = helperObject + decryptionFunc + callerFunc;
-
-        return decryptionCode;
-    }
-
-    private String decryptSignature(String encryptedSig, String decryptionCode) {
-        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) {
-            e.printStackTrace();
-        }
-        Context.exit();
-        if(result != null)
-            return result.toString();
-        else
-            return "";
-    }
-
-    private String cleanUrl(String complexUrl) {
-        return getVideoUrl(getVideoId(complexUrl));
-    }
-
-    private String matchGroup1(String pattern, String input) {
-        Pattern pat = Pattern.compile(pattern);
-        Matcher mat = pat.matcher(input);
-        boolean foundMatch = mat.find();
-        if (foundMatch) {
-            return mat.group(1);
-        }
-        else {
-            Log.w(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
-            new Exception("failed to find pattern \""+pattern+"\"").printStackTrace();
-            return "";
-        }
-
-    }
-}

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

@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
-
-    <ImageView android:id="@+id/detailThumbnailView"
-        android:contentDescription="@string/detailThumbnailViewDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:background="@android:color/black"
-        android:src="@drawable/dummy_thumbnail_dark"/>
-
-    <ScrollView
-        android:id="@+id/detailMainContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="visible">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout
-                android:id="@+id/detailVideoThumbnailWindowLayout"
-                android:layout_width="match_parent"
-                android:layout_height="250dp"
-                android:background="?attr/selectableItemBackground">
-
-                <ProgressBar android:id="@+id/detailProgressBar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:indeterminate="true"
-                    android:indeterminateTint="@color/primaryColorDarkYoutube"
-                    android:indeterminateTintMode="src_in"/>
-
-                <android.support.design.widget.FloatingActionButton
-                    android:id="@+id/playVideoButton"
-                    android:visibility="invisible"
-                    android:layout_width="wrap_content"
-
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    app:backgroundTint="@color/primaryColorYoutube"
-                    android:src="@drawable/ic_play_arrow_black"
-                    android:layout_margin="20dp"/>
-
-                <Button
-                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"/>
-
-            </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detailTextContentLayout"
-                android:visibility="invisible"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingRight="5dp"
-                android:paddingLeft="5dp"
-                android:layout_below="@id/detailVideoThumbnailWindowLayout"
-                android:background="@color/background_gray">
-
-                <TextView android:id="@+id/detailVideoTitleView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:textStyle="bold"
-                    android:paddingBottom="3dp"
-                    android:textSize="@dimen/text_video_title_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                <ImageView android:id="@+id/detailUploaderThumbnailView"
-                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/buddy" />
-
-                <TextView android:id="@+id/detailUploaderView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploaderThumbnailView"
-                    android:layout_alignParentStart="true"
-                    android:textStyle="bold"
-                    android:textSize="@dimen/text_video_uploader_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailViewCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="3dp"
-                    android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_views_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailThumbsDownCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <ImageView android:id="@+id/detailThumbsDownImgView"
-                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toStartOf="@id/detailThumbsDownCountView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_down" />
-
-                <TextView android:id="@+id/detailThumbsUpCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toStartOf="@id/detailThumbsDownImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <ImageView android:id="@+id/detailThumbsUpImgView"
-                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toStartOf="@id/detailThumbsUpImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_up" />
-
-                <TextView android:id="@+id/detailUploadDateView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploaderView"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_upload_date_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailDescriptionView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploadDateView"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_description_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
-                <RelativeLayout
-                    android:id="@+id/detailNextVideoRootLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:layout_below="@id/detailDescriptionView" >
-
-                    <TextView android:id="@+id/detailNextVideoTitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="@android:color/black"
-                        android:text="@string/nextVideoTitle"
-                        />
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailNextVideoTitle"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:layout_below="@id/detailNextVideoRootLayout"
-                    android:text="@string/showSimilarVideosButtonText"/>
-            </RelativeLayout>
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>

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

@@ -10,6 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".VideoItemListActivity"
-        tools:layout="@android:layout/list_content"/>
+        tools:layout="@android:layout/list_content" />
 
 </LinearLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".VideoItemDetailFragment"
@@ -10,23 +10,13 @@
     android:layout_height="match_parent"
     android:id="@+id/videoitem_detail">
 
-    <ImageView android:id="@+id/detailThumbnailView"
-        android:contentDescription="@string/detailThumbnailViewDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:background="@android:color/black"
-        android:src="@drawable/dummy_thumbnail_dark"/>
-
-    <ScrollView
+    <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible">
+        android:visibility="visible"
+        app:parallax_factor="1.9"
+        tools:ignore="UselessParent">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -35,9 +25,21 @@
             <RelativeLayout
                 android:id="@+id/detailVideoThumbnailWindowLayout"
                 android:layout_width="match_parent"
-                android:layout_height="250dp"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground">
 
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:contentDescription="@string/detail_thumbnail_view_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="fitCenter"
+                    android:adjustViewBounds="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:background="@android:color/black"
+                    android:src="@drawable/dummy_thumbnail_dark"/>
+
                 <ProgressBar android:id="@+id/detailProgressBar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -48,12 +50,11 @@
                     android:id="@+id/playVideoButton"
                     android:visibility="invisible"
                     android:layout_width="wrap_content"
-
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:backgroundTint="@color/primaryColorYoutube"
+                    app:backgroundTint="@color/light_youtube_primary_color"
                     android:src="@drawable/ic_play_arrow_black"
-                    android:layout_margin="20dp"/>
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
 
                 <Button
                     android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
@@ -64,160 +65,217 @@
             </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detailTextContentLayout"
-                android:visibility="invisible"
+
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingRight="5dp"
-                android:paddingLeft="5dp"
+                android:layout_height="match_parent"
                 android:layout_below="@id/detailVideoThumbnailWindowLayout"
-                android:background="@color/background_gray">
+                android:background="@color/light_background_color"
+                android:visibility="gone">
 
-                <TextView android:id="@+id/detailVideoTitleView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textStyle="bold"
-                    android:paddingBottom="3dp"
-                    android:textSize="@dimen/text_video_title_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                <ImageView android:id="@+id/detailUploaderThumbnailView"
-                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/buddy" />
-
-                <TextView android:id="@+id/detailUploaderView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploaderThumbnailView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textStyle="bold"
-                    android:textSize="@dimen/text_video_uploader_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailViewCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="3dp"
-                    android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_views_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailThumbsDownCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                <ImageView android:id="@+id/detailThumbsDownImgView"
-                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                    android:layout_toStartOf="@id/detailThumbsDownCountView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_down" />
-
-                <TextView android:id="@+id/detailThumbsUpCountView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                    android:layout_toStartOf="@id/detailThumbsDownImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <ImageView android:id="@+id/detailThumbsUpImgView"
-                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
-                    android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                    android:layout_toStartOf="@id/detailThumbsUpImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_up" />
-
-                <TextView android:id="@+id/detailUploadDateView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploaderView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_upload_date_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView android:id="@+id/detailDescriptionView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailUploadDateView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_description_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
-                <RelativeLayout
-                    android:id="@+id/detailNextVideoRootLayout"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
-                    android:layout_below="@id/detailDescriptionView" >
+                    android:id="@+id/detailTopView">
+
+                    <TextView android:id="@+id/detailVideoTitleView"
+                        android:layout_width="0dp"
+                        android:layout_weight=".7"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/video_item_detail_title_text_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginLeft="12dp"
+                        android:layout_marginStart="12dp"
+                        android:text="Title"/>
+
+                    <ImageView
+                        android:layout_width="15dp"
+                        android:layout_height="30dp"
+                        android:id="@+id/toggleDescriptionView"
+                        android:src="@drawable/arrow_down"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_marginRight="10dp"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginTop="8dp"/>
+
+                </LinearLayout>
+
+                <TextView android:id="@+id/detailViewCountView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:text="10,069,948 views"
+                    android:layout_below="@id/detailTopView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="5dp" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailViewCountView"
+                    android:id="@+id/detailExtraView"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginRight="12dp"
+                    android:layout_marginEnd="12dp"
+                    android:visibility="gone">
+                    <TextView android:id="@+id/detailUploadDateView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Upload date"
+                        android:layout_marginTop="3dp" />
+
+                    <TextView android:id="@+id/detailDescriptionView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/video_item_detail_description_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:layout_below="@id/detailUploadDateView"
+                        android:text="Description............."
+                        android:layout_marginTop="3dp" />
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/linearLayout"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_below="@+id/detailExtraView"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginTop="5dp">
+                    <ImageView android:id="@+id/detailThumbsUpImgView"
+                        android:contentDescription="@string/detail_likes_img_view_description"
+                        android:layout_width="@dimen/video_item_detail_like_image_width"
+                        android:layout_height="@dimen/video_item_detail_like_image_height"
+                        android:src="@drawable/thumbs_up" />
+
+                    <TextView android:id="@+id/detailThumbsUpCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="200" />
+
+                    <ImageView android:id="@+id/detailThumbsDownImgView"
+                        android:contentDescription="@string/detail_dislikes_img_view_description"
+                        android:layout_width="@dimen/video_item_detail_like_image_width"
+                        android:layout_height="@dimen/video_item_detail_like_image_height"
+                        android:src="@drawable/thumbs_down"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"/>
+
+                    <TextView android:id="@+id/detailThumbsDownCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="100" />
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/linearLayout"
+                    android:id="@+id/detailUploaderWrapView"
+                    android:layout_marginTop="12dp">
+
+                    <View
+                        android:background="#000"
+                        android:layout_width="match_parent"
+                        android:layout_height="1px" />
+
+                    <de.hdodenhof.circleimageview.CircleImageView android:id="@+id/detailUploaderThumbnailView"
+                        android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                        android:src="@drawable/buddy"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentStart="true"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"/>
+
+                    <TextView android:id="@+id/detailUploaderView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/video_item_detail_uploader_text_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Uploader"
+                        android:layout_centerVertical="true"
+                        android:layout_toRightOf="@+id/detailUploaderThumbnailView"
+                        android:layout_toEndOf="@+id/detailUploaderThumbnailView"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginStart="28dp" />
+
+                    <View
+                        android:background="#000"
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:layout_below="@id/detailUploaderThumbnailView"/>
+                </RelativeLayout>
+
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:layout_below="@+id/detailUploaderWrapView"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="10dp">
 
                     <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_size"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="@android:color/black"
-                        android:text="@string/nextVideoTitle"
-                        />
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailNextVideoTitle"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
+                        android:text="@string/next_video_title"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <TextView android:id="@+id/detailSimilarTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/similar_videos_btn_text"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textAllCaps="true" />
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:id="@+id/similarVideosView"
+                        android:layout_below="@id/detailSimilarTitle">
+                    </LinearLayout>
                 </RelativeLayout>
-
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:layout_below="@id/detailNextVideoRootLayout"
-                    android:text="@string/showSimilarVideosButtonText"/>
             </RelativeLayout>
         </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
+    </com.nirhart.parallaxscroll.views.ParallaxScrollView>
+</FrameLayout>

app/src/main/res/layout/paginate_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="match_parent"
+    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/player_notification.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:background="@color/background_notification_color"
+    tools:targetApi="jelly_bean">
+
+    <ImageView
+        android:id="@+id/backgroundCover"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:src="@drawable/dummy_thumbnail"
+        android:scaleType="centerCrop"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/backgroundSongName"
+            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="title" />
+
+        <TextView
+            android:id="@+id/backgroundArtist"
+            style="@android:style/TextAppearance.StatusBar.EventContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="artist" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/backgroundPlayPause"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_pause_white_24dp" />
+
+    <ImageButton
+        android:id="@+id/backgroundStop"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_close_white_24dp" />
+
+</LinearLayout>

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:background="@color/background_notification_color"
+    tools:targetApi="jelly_bean" >
+
+    <ImageView
+        android:id="@+id/backgroundCover"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:layout_marginRight="8dp"
+        android:src="@drawable/dummy_thumbnail"
+        android:scaleType="centerCrop"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/backgroundButtons"
+        android:layout_toRightOf="@+id/backgroundCover"
+        android:gravity="center_vertical"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/backgroundSongName"
+            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="40dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="title" />
+
+        <TextView
+            android:id="@+id/backgroundArtist"
+            style="@android:style/TextAppearance.StatusBar.EventContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="artist" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/backgroundStop"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_close_white_24dp" />
+
+    <RelativeLayout
+        android:id="@+id/backgroundButtons"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignBottom="@id/backgroundCover"
+        android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/backgroundCover"
+        android:orientation="horizontal" >
+
+        <ImageButton
+            android:id="@+id/backgroundPlayPause"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:background="#00ffffff"
+            android:clickable="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_pause_white_24dp"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true" />
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -1,67 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="92dp"
-    android:padding="6dp">
+    android:layout_height="wrap_content" >
 
-    <ImageView android:id="@+id/itemThumbnailView"
-        android:contentDescription="@string/itemThumbnailViewDescription"
-        android:layout_width="142dp"
-        android:layout_height="80dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"
-        android:scaleType="centerCrop"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/dummy_thumbnail"/>
+        <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">
 
-    <TextView android:id="@+id/itemVideoTitleView"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_alignParentTop="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/text_search_title_size"/>
+            <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">
 
-    <TextView android:id="@+id/itemUploaderView"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemVideoTitleView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploader_size"/>
+                <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/dummy_thumbnail"/>
 
-    <TextView android:id="@+id/itemUploadDateView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemUploaderView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploadtime_size"
-        />
+                <TextView android:id="@+id/itemDurationView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/itemThumbnailView"
+                    android:layout_alignRight="@id/itemThumbnailView"
+                    android:layout_alignEnd="@id/itemThumbnailView"
+                    android:layout_marginRight="@dimen/video_item_search_duration_margin"
+                    android:layout_marginEnd="@dimen/video_item_search_duration_margin"
+                    android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+                    android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+                    android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_duration_text_size"
+                    android:background="@color/duration_dackground_color"
+                    android:textColor="@color/duration_text_color"/>
 
-    <TextView android:id="@+id/itemDurationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
-        android:layout_alignEnd="@id/itemThumbnailView"
-        android:layout_marginRight="2dp"
-        android:layout_marginEnd="2dp"
-        android:layout_marginBottom="2dp"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        android:paddingRight="5dp"
-        android:paddingLeft="5dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_duration_size"
-        android:background="@color/durationBackground"
-        android:textColor="@color/durationText"/>
+            </RelativeLayout>
 
-</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/itemVideoTitleView"
+                    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"/>
+
+                <TextView android:id="@+id/itemUploaderView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    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/itemUploadDateView"
+                        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"/>
+
+                    <TextView android:id="@+id/itemViewCountView"
+                        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"/>
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </RelativeLayout>
+</LinearLayout>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_item_screen_rotation"
-        android:title="@string/screenRotation"
+        android:title="@string/screen_rotation"
         app:showAsAction="always"
         android:icon="@drawable/ic_screen_rotation_white"/>
 </menu>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_item_play_audio"
-        android:title="@string/playAudio"
+        android:title="@string/play_audio"
         app:showAsAction="ifRoom"
         android:icon="@drawable/ic_headset_black" />
 
@@ -18,7 +18,7 @@
         android:icon="@drawable/ic_share_black"/>
 
     <item android:id="@+id/action_play_with_kodi"
-        android:title="@string/playWithKodiTitle"
+        android:title="@string/play_with_kodi_title"
         app:showAsAction="ifRoom"
         android:icon="@drawable/ic_cast_black"/>
 

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

@@ -1,54 +1,74 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s Aufrufe</string>
-    <string name="uploadDateText">Hochgeladen am %1$s</string>
-    <string name="noPlayerFound">Keinen Streamplayer gefunden. Vielleicht möchtest du einen installieren.</string>
-    <string name="installStreamPlayer">Jetzt installieren</string>
+    <string name="view_count_text">%1$s Aufrufe</string>
+    <string name="upload_date_text">Hochgeladen am %1$s</string>
+    <string name="no_player_found">Keinen Streamplayer gefunden. Möchtest du VLC installieren?</string>
+    <string name="install">Jetzt installieren</string>
     <string name="cancel">Abbrechen</string>
     <string name="open_in_browser">In Browser öffnen</string>
     <string name="share">Teilen</string>
     <string name="download">Download</string>
     <string name="search">Suchen</string>
     <string name="settings">Einstellungen</string>
-    <string name="didYouMean">Meintest du: </string>
-    <string name="searchPage">Suchseite: </string>
-    <string name="shareDialogTitle">Teilen mit:</string>
-    <string name="chooseBrowser">Browser:</string>
-    <string name="screenRotation">Rotation</string>
-    <string name="title_activity_settings">Einstellungen</string>
+    <string name="did_you_mean">Meintest du: </string>
+    <string name="search_page">Suchseite: </string>
+    <string name="share_dialog_title">Teilen mit:</string>
+    <string name="choose_browser">Browser:</string>
+    <string name="screen_rotation">Rotation</string>
+    <string name="settings_activity_title">Einstellungen</string>
     <string name="useExternalPlayerTitle">Externen Player benutzen</string>
-    <string name="downloadLocation">Downloadverzeichnis</string>
-    <string name="downloadLocationSummary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
-    <string name="downloadLocationDialogTitle">Download Verzeichnis eingeben</string>
-    <string name="autoPlayThroughIntentTitle">Automatisches Abspielen durch Intent</string>
-    <string name="autoPlayThroughIntentSummary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
-    <string name="defaultResolutionPreferenceTitle">Standard Auflösung</string>
-    <string name="playWithKodiTitle">Mit Kodi abspielen</string>
-    <string name="koreNotFound">Kore app wurde nicht gefunden. Kore wird benötigt, um Videos mit Kodi wieder zu geben.</string>
+    <string name="download_path_title">Downloadverzeichnis für Videos</string>
+    <string name="download_path_summary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
+    <string name="download_path_dialog_title">Download-Verzeichnis für Videos eingeben</string>
+    <string name="autoplay_through_intent_title">Automatisches Abspielen durch Intent</string>
+    <string name="autoplay_through_intent_summary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
+    <string name="default_resolution_title">Standard Auflösung</string>
+    <string name="play_with_kodi_title">Mit Kodi abspielen</string>
+    <string name="kore_not_found">Kore App wurde nicht gefunden. Möchten sie Kore jetzt installieren?</string>
     <string name="installeKore">Kore installieren</string>
-    <string name="showPlayWithKodiTitle">Zeige \"Mit Kodi abspielen\" Option</string>
-    <string name="showPlayWithKodiSummary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
-    <string name="leftPlayButtonTitle">Play-Button auf der linken Seite.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Bevorzugtes Audio Format</string>
-    <string name="webMAudioDescription">WebM - freies Format</string>
-    <string name="m4aAudioDescription">m4a - bessere Qualität</string>
-    <string name="downloadDialogTitle">Herunterladen</string>
+    <string name="show_play_with_kodi_title">Zeige \"Mit Kodi abspielen\" Option</string>
+    <string name="show_play_with_kodi_summary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Bevorzugtes Audio Format</string>
+    <string name="webm_description">WebM — freies Format</string>
+    <string name="m4a_description">m4a — bessere Qualität</string>
+    <string name="download_dialog_title">Herunterladen</string>
     <string-array name="downloadOptions">
         <item>Video</item>
         <item>Audio</item>
     </string-array>
-    <string name="nextVideoTitle">Nächstes Video</string>
-    <string name="showNextAndSimilarTitle">Zeige nächstes und ähnliche Videos</string>
-    <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
-    <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC</string>
-<string name="searchLanguageTitle">Bevorzugte Sprache</string>
-    <string name="itemThumbnailViewDescription">Video-Vorschau-Bild</string>
-    <string name="detailThumbnailViewDescription">Video-Vorschau-Bild</string>
-    <string name="detailUploaderThumbnailViewDescription">Nutzerbild</string>
-    <string name="detailThumbsDownImgViewDescription">gefällt nicht</string>
-    <string name="detailThumbsUpImgViewDescription">gefällt</string>
+    <string name="next_video_title">Nächstes Video</string>
+    <string name="show_next_and_similar_title">Zeige nächstes und ähnliche Videos</string>
+    <string name="url_not_supported_toast">URL wird nicht unterstützt</string>
+    <string name="similar_videos_btn_text">Ähnliche Videos</string>
+    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
+    <string name="search_language_title">Bevorzugte Sprache des Inhalts</string>
+    <string name="list_thumbnail_view_description">Video-Vorschau-Bild</string>
+    <string name="detail_thumbnail_view_description">Video-Vorschau-Bild</string>
+    <string name="detail_uploader_thumbnail_view_description">Nutzerbild</string>
+    <string name="detail_dislikes_img_view_description">Gefällt nicht</string>
+    <string name="detail_likes_img_view_description">Gefällt</string>
+    <string name="loading">Lade</string>
+    <string name="use_external_video_player_title">Benutze externen Videoabspieler</string>
+    <string name="use_external_audio_player_title">Benutze externen Audioabspieler</string>
+    <string name="background_player_playing_toast">Spiele im Hintergrund ab</string>
+    <string name="play_btn_text">Abspielen</string>
+
+    <string name="use_tor_title">Benutze TOR</string>
+    <string name="use_tor_summary">Erzwinge das Herunterladen durch TOR für verbesserte Privatsphäre (Videostream noch nicht unterstützt)</string>
+<string name="background_player_name">NewPipe Hintergrundwiedergabe</string>
+    <string name="network_error">Netzwerk Fehler</string>
+
+    <string name="download_path_audio_title">Download-Verzeichnis für Musik</string>
+    <string name="download_path_audio_summary">Verzeichnis um heruntergeladene Audiodateien zu speichern.</string>
+    <string name="download_path_audio_dialog_title">Pfad für heruntergeladene Audiodateien eingeben.</string>
+
+    <string name="theme_title">Aussehen</string>
+    <string name="dark_theme_title">Dunkel</string>
+    <string name="light_theme_title">Hell</string>
+
+    <string name="settings_category_appearance_title">Aussehen</string>
+    <string name="settings_category_other_title">Andere</string>
+    <string name="err_dir_create">Kann Downloadverzeichnis nicht anlegen \'%1$s\'</string>
+    <string name="info_dir_created">Erstelle Download Verzeichnis \'%1$s\'</string>
 </resources>

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

@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="background_player_name">NewPipe Background Player</string>
+    <string name="view_count_text">%1$s προβολές</string>
+    <string name="upload_date_text">Ανέβηκε στις %1$s</string>
+    <string name="no_player_found">Δεν βρέθηκε πρόγραμμα αναπαραγωγής. Εγκατάσταση του VLC;</string>
+    <string name="install">Εγκατάσταση</string>
+    <string name="cancel">Ακύρωση</string>
+    <string name="open_in_browser">Άνοιγμα στον browser</string>
+    <string name="share">Κοινοποίηση</string>
+    <string name="loading">Φορτώνει</string>
+    <string name="download">Λήψη</string>
+    <string name="search">Αναζήτηση</string>
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="did_you_mean">"Μήπως εννοείτε: "</string>
+    <string name="search_page">"Αναζήτηση σελίδας: "</string>
+    <string name="share_dialog_title">Κοινοποίηση με:</string>
+    <string name="choose_browser">Επιλέξτε browser:</string>
+    <string name="screen_rotation">περιστροφή</string>
+    <string name="settings_activity_title">Ρυθμίσεις</string>
+    <string name="use_external_video_player_title">Χρήση εξωτερικού video player</string>
+    <string name="use_external_audio_player_title">Χρήση εξωτερικού audio player</string>
+
+    <string name="download_path_title">Διαδρομή λήψης video</string>
+    <string name="download_path_summary">Διαδρομή για αποθήκευση των video.</string>
+    <string name="download_path_dialog_title">Εισάγετε διαδρομή για λήψη των video</string>
+
+    <string name="download_path_audio_title">Διαδρομή λήψης αρχείων ήχου</string>
+    <string name="download_path_audio_summary">Διαδρομή για αποθήκευση αρχείων ήχου</string>
+    <string name="download_path_audio_dialog_title">Εισάγετε διαδρομή για λήψη αρχείων ήχου.</string>
+
+    <string name="autoplay_through_intent_title">Αυτόματη αναπαραγωγή μέσω Intent</string>
+    <string name="autoplay_through_intent_summary">Αυτόματη αναπαραγωγή video όταν καλείται από άλλη εφαρμογή.</string>
+    <string name="default_resolution_title">Προεπιλεγμένη ανάλυση</string>
+    <string name="play_with_kodi_title">Αναπαραγωγή με το Kodi</string>
+    <string name="kore_not_found">Η εφαρμογή Kore δεν βρέθηκε. Εγκατάσταση;</string>
+    <string name="show_play_with_kodi_title">Εμφάνιση της επιλογής \"Αναπαραγωγή με το Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Προβολή μιας επιλογής για αναπαραγωγή με το Kodi media center.</string>
+    <string name="play_audio">Ήχος</string>
+    <string name="default_audio_format_title">Προεπιλεγμένη μορφή ήχου</string>
+    <string name="webm_description">WebM — δωρεάν format</string>
+    <string name="m4a_description">m4a — καλύτερη ποιότητα</string>
+    <string name="theme_title">Θέμα</string>
+    <string name="dark_theme_title">Σκοτεινό</string>
+    <string name="light_theme_title">Φωτεινό</string>
+
+    <string name="download_dialog_title">Λήψη</string>
+    <string name="next_video_title">Επόμενο video</string>
+    <string name="show_next_and_similar_title">Προβολή επόμενου και σχετικών video</string>
+    <string name="url_not_supported_toast">Δεν υποστηρίζεται η διεύθυνση URL</string>
+    <string name="similar_videos_btn_text">Σχετικά video</string>
+    <string name="search_language_title">Προτιμώμενη γλώσσα περιεχομένου</string>
+    <string name="settings_category_video_audio_title">Video &amp; Ήχος</string>
+    <string name="settings_category_appearance_title">Εμφάνιση</string>
+    <string name="settings_category_other_title">Άλλα</string>
+    <string name="background_player_playing_toast">Αναπαραγωγή στο υπόβαθρο</string>
+    <string name="play_btn_text">Αναπαραγωγή</string>
+    <string name="network_error">Σφάλμα δικτύου</string>
+
+    <string name="list_thumbnail_view_description">Εικόνα προεπισκόπησης video</string>
+    <string name="detail_thumbnail_view_description">Εικόνα προεπισκόπησης video</string>
+    <string name="detail_uploader_thumbnail_view_description">Εικόνα προφίλ του uploader</string>
+    <string name="detail_likes_img_view_description">Like</string>
+    <string name="detail_dislikes_img_view_description">Dislike</string>
+    <string name="use_tor_title">Χρήση του Tor</string>
+    <string name="use_tor_summary">Αναγκάζει την κίνηση λήψης μέσω Tor για αυξημένη ανωνυμία (η αναπαραγωγή δεν υποστηρίζεται ακόμη)</string>
+
+    <string name="err_dir_create">Δεν μπόρεσε να δημιουργηθεί ο φάκελος \'%1$s\'</string>
+    <string name="info_dir_created">Δημιουργήθηκε ο φάκελος \'%1$s\'</string>
+</resources>

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

@@ -1,40 +1,41 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s visitas</string>
-    <string name="uploadDateText">Subido el %1$s</string>
-    <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
-    <string name="installStreamPlayer">Instalarlo</string>
+    <string name="view_count_text">%1$s visitas</string>
+    <string name="upload_date_text">Subido el %1$s</string>
+    <string name="no_player_found">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
+    <string name="install">Instalarlo</string>
     <string name="cancel">Cancelar</string>
     <string name="open_in_browser">Abrir en el navegador</string>
     <string name="share">Compartir</string>
     <string name="download">Descargar</string>
     <string name="search">Buscar</string>
     <string name="settings">Ajustes</string>
-    <string name="didYouMean">"¿Querías decir?: "</string>
-    <string name="searchPage">Buscar página: </string>
-    <string name="shareDialogTitle">Compartir con:</string>
-    <string name="chooseBrowser">Selecciona navegador:</string>
-    <string name="screenRotation">rotación</string>
-    <string name="title_activity_settings">Ajustes</string>
+    <string name="did_you_mean">"¿Querías decir?: "</string>
+    <string name="search_page">Buscar página: </string>
+    <string name="share_dialog_title">Compartir con:</string>
+    <string name="choose_browser">Selecciona navegador:</string>
+    <string name="screen_rotation">rotación</string>
+    <string name="settings_activity_title">Ajustes</string>
     <string name="useExternalPlayerTitle">Usar reproductor externo</string>
-    <string name="downloadLocation">Descargar en&#8230;</string>
-    <string name="downloadLocationSummary">Ruta donde guardar los vídeos descargados.</string>
-    <string name="downloadLocationDialogTitle">Localización del directorio de descargas</string>
-    <string name="autoPlayThroughIntentTitle">Reproducción automática</string>
-    <string name="autoPlayThroughIntentSummary">Reproducir los vídeos automaticamente cuando se llama desde otra aplicación.</string>
-    <string name="defaultResolutionPreferenceTitle">Resolución por defecto</string>
-    <string name="playWithKodiTitle">Reproducir con Kodi</string>
-    <string name="koreNotFound">Aplicación Kore no encontrada. Kore es necesario para reproducir vídeos con Kodi media center.</string>
+    <string name="download_path_title">Descargar en…</string>
+    <string name="download_path_summary">Ruta donde guardar los vídeos descargados.</string>
+    <string name="download_path_dialog_title">Localización del directorio de descargas</string>
+    <string name="autoplay_through_intent_title">Reproducción automática</string>
+    <string name="autoplay_through_intent_summary">Reproducir los vídeos automaticamente cuando se llama desde otra aplicación.</string>
+    <string name="default_resolution_title">Resolución por defecto</string>
+    <string name="play_with_kodi_title">Reproducir con Kodi</string>
+    <string name="kore_not_found">Aplicación Kore no encontrada. Kore es necesario para reproducir vídeos con Kodi media center.</string>
     <string name="installeKore">Instalar Kore</string>
-    <string name="showPlayWithKodiTitle">Mostrar la opción \"Reproducir con Kodi\"</string>
-    <string name="showPlayWithKodiSummary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
-<string name="leftPlayButtonTitle">Mostrar el botón de reproducir en el lado izquierdo.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Formato de audio por defecto</string>
-    <string name="webMAudioDescription">WebM - formato libre</string>
-    <string name="m4aAudioDescription">m4a - mejor calidad</string>
-    <string name="downloadDialogTitle">Descargar</string>
-    <string name="nextVideoTitle">Siguiente vídeo</string>
-    <string name="urlNotSupportedText">URL no soportada.</string>
-    <string name="showSimilarVideosButtonText">Vídeos similares</string>
-</resources>
+    <string name="show_play_with_kodi_title">Mostrar la opción \"Reproducir con Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Formato de audio por defecto</string>
+    <string name="webm_description">WebM — formato libre</string>
+    <string name="m4a_description">m4a — mejor calidad</string>
+    <string name="download_dialog_title">Descargar</string>
+    <string name="next_video_title">Siguiente vídeo</string>
+    <string name="url_not_supported_toast">URL no soportada.</string>
+    <string name="similar_videos_btn_text">Vídeos similares</string>
+<string name="background_player_name">Reproductor de fondo NewPipe</string>
+    <string name="loading">Cargando</string>
+    </resources>

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

@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s ikustaldi</string>
+    <string name="upload_date_text">Argitaratze-data: %1$s</string>
+    <string name="install">Instalatu</string>
+    <string name="cancel">Utzi</string>
+    <string name="open_in_browser">Nabigatzailean ireki</string>
+    <string name="share">Partekatu</string>
+    <string name="loading">Kargatzen</string>
+    <string name="download">Deskargatu</string>
+    <string name="search">Bilatu</string>
+    <string name="settings">Ezarpenak</string>
+    <string name="share_dialog_title">Partekatu honekin:</string>
+    <string name="choose_browser">Nabigatzailea aukeratu:</string>
+    <string name="screen_rotation">biratzea</string>
+    <string name="settings_activity_title">Ezarpenak</string>
+    <string name="download_path_title">Deskargatzeko kokapena</string>
+    <string name="download_path_summary">Deskargatutako bideoak gordetzeko lekua.</string>
+    <string name="download_path_dialog_title">Sar ezazu deskargatzeko lekua</string>
+    <string name="default_resolution_title">Lehenetsitako bereizmena</string>
+    <string name="play_with_kodi_title">Kodirekin erreproduzitu</string>
+    <string name="kore_not_found">Kore aplikazioa ez da aurkitu. Kore beharrezkoa da Kodi multimedia zentroarekin bideoak erreproduzitzeko.</string>
+    <string name="installeKore">Kore instalatu</string>
+    <string name="show_play_with_kodi_title">\"Kodirekin erreproduzitu\" aukera erakutsi</string>
+    <string name="show_play_with_kodi_summary">Kodi multimedia zentroarekin bideoa erreproduzitzeko aukera erakusten du.</string>
+    <string name="play_audio">Audioa</string>
+    <string name="default_audio_format_title">Audio formatu lehenetsia</string>
+    <string name="webm_description">WebM &#8212; formatu askea</string>
+    <string name="m4a_description">m4a &#8212; kalitate hobea</string>
+    <string name="download_dialog_title">Deskargatu</string>
+    <string name="next_video_title">Hurrengo bideoa</string>
+    <string name="show_next_and_similar_title">Hurrengo bideoa eta antzekoak erakutsi</string>
+    <string name="url_not_supported_toast">URLa ez da onartzen.</string>
+    <string name="similar_videos_btn_text">Antzeko bideoak</string>
+    <string name="search_language_title">Edukiaren hizkuntz lehenetsia</string>
+    <string name="settings_category_video_audio_title">Bideoa eta Audioa</string>
+    <string name="play_btn_text">Erreproduzitu</string>
+
+    <string name="list_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
+    <string name="detail_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
+    <string name="detail_uploader_thumbnail_view_description">Igotzailearen argazkitxoa</string>
+    <string name="detail_dislikes_img_view_description">Ez dute gustoko</string>
+    <string name="detail_likes_img_view_description">Gustoko dute</string>
+    <string name="use_tor_title">Tor erabili</string>
+    <string name="use_tor_summary">Trafikoa Tor bidez deskargatzea behartzen du pribatutasuna hobetzeko (jario bideoak ez daude oraindik onartuta)</string>
+    <string name="background_player_name">NewPipe atzeko planoko erreproduzitzailea</string>
+    <string name="no_player_found">Jario erreproduzitzailerik ez da aurkitu. Agian bat instalatu nahi dezakezu.</string>
+    <string name="did_you_mean">"Hau esan nahi al zenuen: "</string>
+    <string name="search_page">"Orrialdea bilatu: "</string>
+    <string name="use_external_video_player_title">Kanpoko bideo erreproduzitzailea erabili</string>
+    <string name="use_external_audio_player_title">Kanpoko audio erreproduzitzailea erabili</string>
+    <string name="autoplay_through_intent_title">Intent bidez automatikoki erreproduzitu</string>
+    <string name="autoplay_through_intent_summary">Bideoa automatikoki hasten du beste aplikazio batetik deitu denean.</string>
+    <string name="background_player_playing_toast">Atzeko planoan erreproduzitzen</string>
+</resources>

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

@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="viewCountText">%1$s نماها</string>
-    <string name="uploadDateText">بارگذاری‌شده در: %1$s</string>
-    <string name="noPlayerFound">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
-    <string name="installStreamPlayer">نصب کنید</string>
+    <string name="view_count_text">%1$s نماها</string>
+    <string name="upload_date_text">بارگذاری‌شده در: %1$s</string>
+    <string name="no_player_found">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
+    <string name="install">نصب کنید</string>
     <string name="cancel">انصراف</string>
     <string name="open_in_browser">بازکردن در مرورگر</string>
     <string name="share">هم‌رسانی</string>
     <string name="download">بارگیری</string>
     <string name="search">جستجو</string>
     <string name="settings">تنظیمات</string>
-    <string name="didYouMean">منظورتان این است: </string>
-    <string name="searchPage">صفحه‌ی جستجو: </string>
-    <string name="shareDialogTitle">هم‌رسانی با:</string>
-    <string name="chooseBrowser">مرورگر را برگزینید:</string>
-    <string name="screenRotation">چرخش</string>
-    <string name="title_activity_settings">تنظیمات</string>
+    <string name="did_you_mean">منظورتان این است: </string>
+    <string name="search_page">صفحه‌ی جستجو: </string>
+    <string name="share_dialog_title">هم‌رسانی با:</string>
+    <string name="choose_browser">مرورگر را برگزینید:</string>
+    <string name="screen_rotation">چرخش</string>
+    <string name="settings_activity_title">تنظیمات</string>
     <string name="useExternalPlayerTitle">استفاده از پخش‌کننده‌ی خارجی</string>
-    <string name="downloadLocation">محل بارگیری</string>
-    <string name="downloadLocationSummary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
-    <string name="downloadLocationDialogTitle">مسیر دریافت را وارد کنید</string>
-    <string name="autoPlayThroughIntentTitle">پخش خودکار از Intent</string>
-    <string name="autoPlayThroughIntentSummary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
-    <string name="defaultResolutionPreferenceTitle">وضوح پیش‌فرض</string>
-    <string name="playWithKodiTitle">پخش با Kodi</string>
-    <string name="koreNotFound">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
+    <string name="download_path_title">محل بارگیری</string>
+    <string name="download_path_summary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
+    <string name="download_path_dialog_title">مسیر دریافت را وارد کنید</string>
+    <string name="autoplay_through_intent_title">پخش خودکار از Intent</string>
+    <string name="autoplay_through_intent_summary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
+    <string name="default_resolution_title">وضوح پیش‌فرض</string>
+    <string name="play_with_kodi_title">پخش با Kodi</string>
+    <string name="kore_not_found">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
     <string name="installeKore">نصب Kore</string>
-    <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
-    <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
-    <string name="leftPlayButtonTitle">نمایش دکمه‌ی پخش در سمت چپ.</string>
-    <string name="playAudio">صدا</string>
-    <string name="defaultAudioFormatTitle">قالب پیش‌فرض صدا</string>
-    <string name="webMAudioDescription">WebM - قالبی آزاد</string>
-    <string name="m4aAudioDescription">m4a - کیفیت بهتر</string>
-    <string name="downloadDialogTitle">دریافت</string>
+    <string name="show_play_with_kodi_title">نمایش گزینه‌ی «پخش با Kodi»</string>
+    <string name="show_play_with_kodi_summary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
+    <string name="play_audio">صدا</string>
+    <string name="default_audio_format_title">قالب پیش‌فرض صدا</string>
+    <string name="webm_description">WebM &#8212; قالبی آزاد</string>
+    <string name="m4a_description">m4a &#8212; کیفیت بهتر</string>
+    <string name="download_dialog_title">دریافت</string>
     <string-array name="downloadOptions">
         <item>ویدئو</item>
         <item>صدا</item>
     </string-array>
-    <string name="nextVideoTitle">ویدئوی بعدی</string>
-    <string name="urlNotSupportedText">پیوند پشتیبانی نمی‌شود.</string>
+    <string name="next_video_title">ویدئوی بعدی</string>
+    <string name="url_not_supported_toast">پیوند پشتیبانی نمی‌شود.</string>
 </resources>

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

@@ -1,41 +1,71 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appellée à partir d\'une autre application.</string>
+    <string name="autoplay_through_intent_summary">Lire automatiquement une vidéo lorsqu’elle a été appelée depuis une autre application.</string>
     <string name="cancel">Annuler</string>
-    <string name="chooseBrowser">Choisir un navigateur:</string>
-    <string name="defaultResolutionPreferenceTitle">Résolution par défaut:</string>
-    <string name="didYouMean">S\'agirait-il de:</string>
+    <string name="choose_browser">Choisir un navigateur :</string>
+    <string name="default_resolution_title">Définition par défaut</string>
+    <string name="did_you_mean">"S’agirait-il de : "</string>
     <string name="download">Télécharger</string>
-    <string name="downloadLocation">Emplacement des téléchargements</string>
-    <string name="downloadLocationDialogTitle">Entrez l\'emplacement du téléchargement</string>
-    <string name="downloadLocationSummary">Emplacement des vidéos téléchargées.</string>
-    <string name="installStreamPlayer">Installer</string>
+    <string name="download_path_title">Répertoire de téléchargement des vidéos</string>
+    <string name="download_path_dialog_title">Entrer le chemin du répertoire de téléchargement des vidéos</string>
+    <string name="download_path_summary">Chemin du répertoire stockant les vidéos téléchargées.</string>
+    <string name="install">Installer</string>
     <string name="installeKore">Installer Kore</string>
-    <string name="koreNotFound">L\'application Kore est introuvable. Kore est nécessaire afin de lire des vidéos dans Kodi media center.</string>
-    <string name="noPlayerFound">Aucun lecteur de streaming détecté. Vous devriez en installer un.</string>
+    <string name="kore_not_found">L’application Kore est introuvable. Installer Kore ?</string>
+    <string name="no_player_found">Aucun lecteur de flux réseau trouvé. Installer VLC ?</string>
     <string name="open_in_browser">Ouvrir dans le navigateur</string>
-    <string name="autoPlayThroughIntentTitle">Lecture automatique via Intent</string>
-    <string name="playWithKodiTitle">Lire avec Kodi</string>
-    <string name="screenRotation">rotation</string>
-    <string name="search">Chercher</string>
-    <string name="searchPage">Chercher dans la page:</string>
+    <string name="autoplay_through_intent_title">Lecture automatique via Intent</string>
+    <string name="play_with_kodi_title">Lire avec Kodi</string>
+    <string name="screen_rotation">rotation</string>
+    <string name="search">Rechercher</string>
+    <string name="search_page">"Rechercher dans la page : "</string>
     <string name="settings">Paramètres</string>
     <string name="share">Partager</string>
-    <string name="shareDialogTitle">Partager avec:</string>
-    <string name="showPlayWithKodiSummary">Afficher une option pour lire la vidéo avec Kodi media center.</string>
-    <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
-    <string name="title_activity_settings">Paramètres</string>
-    <string name="uploadDateText">Mise en ligne le %1$s</string>
+    <string name="share_dialog_title">Partager avec :</string>
+    <string name="show_play_with_kodi_summary">Afficher une option pour lire la vidéo via la médiathèque Kodi.</string>
+    <string name="show_play_with_kodi_title">Afficher l’option « Lire avec Kodi »</string>
+    <string name="settings_activity_title">Paramètres</string>
+    <string name="upload_date_text">Mise en ligne le %1$s</string>
     <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
-    <string name="viewCountText">%1$s vues</string>
-    <string name="leftPlayButtonTitle">Afficher le bouton de lecture sur la gauche.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Format audio par défaut</string>
-    <string name="webMAudioDescription">WebM- format libre</string>
-    <string name="m4aAudioDescription">m4a - meilleur qualité</string>
-    <string name="downloadDialogTitle">Télécharger</string>
-    <string name="nextVideoTitle">Vidéo suivante</string>
-    <string name="showNextAndSimilarTitle">Afficher les vidéos suivantes et similaires</string>
-    <string name="urlNotSupportedText">URL non supportée.</string>
-    <string name="showSimilarVideosButtonText">Vidéos similaires</string>
-    </resources>
+    <string name="view_count_text">%1$s vues</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Format audio par défaut</string>
+    <string name="webm_description">WebM — format libre</string>
+    <string name="m4a_description">m4a — meilleure qualité</string>
+    <string name="download_dialog_title">Télécharger</string>
+    <string name="next_video_title">Vidéo suivante</string>
+    <string name="show_next_and_similar_title">Afficher les vidéos suivantes et similaires</string>
+    <string name="url_not_supported_toast">URL non pris en charge</string>
+    <string name="similar_videos_btn_text">Vidéos similaires</string>
+    <string name="settings_category_video_audio_title">Vidéo et audio</string>
+    <string name="settings_category_other_title">Autre</string>
+
+    <string name="list_thumbnail_view_description">Miniature d’aperçu vidéo</string>
+    <string name="detail_thumbnail_view_description">Miniature d’aperçu vidéo</string>
+    <string name="detail_dislikes_img_view_description">Je n’aime pas</string>
+    <string name="detail_likes_img_view_description">J’aime</string>
+    <string name="search_language_title">Langue préférée du contenu</string>
+    <string name="detail_uploader_thumbnail_view_description">Miniature de l’avatar de l’utilisateur</string>
+    <string name="use_external_video_player_title">Utiliser un lecteur vidéo externe</string>
+    <string name="use_external_audio_player_title">Utiliser un lecteur audio externe</string>
+    <string name="background_player_playing_toast">Lecture en arrière-plan</string>
+    <string name="background_player_name">Lecteur en arrière-plan NewPipe</string>
+    <string name="loading">Chargement</string>
+    <string name="play_btn_text">Lecture</string>
+
+    <string name="use_tor_title">Utiliser Tor</string>
+    <string name="use_tor_summary">Forcer le trafic de téléchargement via Tor pour plus de confidentialité (vidéos diffusés en flux réseau non pris en charge pour l’instant)</string>
+<string name="theme_title">Thème</string>
+    <string name="dark_theme_title">Sombre</string>
+    <string name="light_theme_title">Clair</string>
+
+    <string name="settings_category_appearance_title">Apparence</string>
+    <string name="network_error">Erreur réseau</string>
+
+    <string name="download_path_audio_title">Répertoire de téléchargement des audios</string>
+    <string name="download_path_audio_summary">Chemin de stockage des fichiers audio téléchargés</string>
+    <string name="download_path_audio_dialog_title">Entrez le chemin de stockage fichiers audio téléchargés</string>
+
+    <string name="err_dir_create">Impossible de créer le répertoire de téléchargement « %1$s »</string>
+    <string name="info_dir_created">Répertoire de téléchargement « %1$s » créé</string>
+</resources>

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

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s צפיות</string>
+    <string name="upload_date_text">הועלה בתאריך %1$s</string>
+    <string name="share">שתף</string>
+    <string name="search">חפש</string>
+    <string name="next_video_title">הבא</string>
+    <string name="download">הורדה</string>
+    <string name="settings">הגדרות</string>
+    <string name="settings_activity_title">הגדרות</string>
+    </resources>

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

@@ -1,44 +1,75 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s megtekintés</string>
-    <string name="uploadDateText">Feltöltve: %1$s</string>
-    <string name="noPlayerFound">Nem található lejátszó. Telepítsen egyet!</string>
-    <string name="installStreamPlayer">Telepítsen egyet</string>
+    <string name="view_count_text">%1$s megtekintés</string>
+    <string name="upload_date_text">Feltöltve: %1$s</string>
+    <string name="no_player_found">Nem található megfelelő lejátszó. Feltelepíti a VLC lejátszót?</string>
+    <string name="install">Telepítés</string>
     <string name="cancel">Mégse</string>
     <string name="open_in_browser">Megnyitás böngészőben</string>
     <string name="share">Megosztás</string>
     <string name="download">Letöltés</string>
     <string name="search">Keresés</string>
     <string name="settings">Beállítások</string>
-    <string name="didYouMean">Erre gondolt: </string>
-    <string name="searchPage">Keresési lap: </string>
-    <string name="shareDialogTitle">Megosztás ezzel:</string>
-    <string name="chooseBrowser">Válasszon böngészőt:</string>
-    <string name="screenRotation">forgatás</string>
-    <string name="title_activity_settings">Beállítások</string>
+    <string name="did_you_mean">Erre gondolt: </string>
+    <string name="search_page">"Keresőlap: "</string>
+    <string name="share_dialog_title">Megosztás ezzel:</string>
+    <string name="choose_browser">Válasszon böngészőt:</string>
+    <string name="screen_rotation">forgatás</string>
+    <string name="settings_activity_title">Beállítások</string>
     <string name="useExternalPlayerTitle">Külső lejátszó használata</string>
-    <string name="downloadLocation">Letöltések helye</string>
-    <string name="downloadLocationSummary">Útvonal a letöltött videók tárolásához</string>
-    <string name="downloadLocationDialogTitle">Adja meg a letöltési útvonalat</string>
-    <string name="autoPlayThroughIntentTitle">Automatikus lejátszás Intent-en keresztül</string>
-    <string name="autoPlayThroughIntentSummary">Automatikusan elindítja a videót, ha az külső alkalmazásból volt hívva</string>
-    <string name="defaultResolutionPreferenceTitle">Alapértelmezett felbontás</string>
-    <string name="playWithKodiTitle">Lejátszás Kodi-val</string>
-    <string name="koreNotFound">A Kore alkalmazás nem található. A Kore szükséges a videók Kodi médiaközponttal való lejátszásához.</string>
+    <string name="download_path_title">Letöltött videófájlok helye</string>
+    <string name="download_path_summary">Útvonal a letöltött videók tárolásához.</string>
+    <string name="download_path_dialog_title">Adja meg a videófájlok letöltési helyét</string>
+    <string name="autoplay_through_intent_title">Automatikus lejátszás Intent-en keresztül</string>
+    <string name="autoplay_through_intent_summary">Videó automatikus lejátszása külső alkalmazással való megnyitás esetén.</string>
+    <string name="default_resolution_title">Alapértelmezett felbontás</string>
+    <string name="play_with_kodi_title">Lejátszás Kodi-val</string>
+    <string name="kore_not_found">A Kore alkalmazás nem található. Feltelepíti a Kore lejátszót?</string>
     <string name="installeKore">Kore telepítése</string>
-    <string name="showPlayWithKodiTitle">\"Lejátszás Kodi-val\" opció mutatása</string>
-    <string name="showPlayWithKodiSummary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
-    <string name="leftPlayButtonTitle">Lejátszás gomb bal oldalon mutatása</string>
-    <string name="playAudio">Hang</string>
-    <string name="defaultAudioFormatTitle">Alapértelmezett hang formátum</string>
-    <string name="webMAudioDescription">WebM - szabad formátum</string>
-    <string name="m4aAudioDescription">m4a - jobb minőség</string>
-    <string name="downloadDialogTitle">Letöltés</string>
+    <string name="show_play_with_kodi_title">\"Lejátszás Kodi-val\" opció mutatása</string>
+    <string name="show_play_with_kodi_summary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
+    <string name="play_audio">Hang</string>
+    <string name="default_audio_format_title">Alapértelmezett hang formátum</string>
+    <string name="webm_description">WebM — szabad formátum</string>
+    <string name="m4a_description">m4a — jobb minőség</string>
+    <string name="download_dialog_title">Letöltés</string>
     <string-array name="downloadOptions">
         <item>Videó</item>
         <item>Hang</item>
     </string-array>
-<string name="nextVideoTitle">Következő videó</string>
-    <string name="urlNotSupportedText">A webcím nem támogatott.</string>
-<string name="showSimilarVideosButtonText">Hasonló videók</string>
-    </resources>
+    <string name="next_video_title">Következő videó</string>
+    <string name="url_not_supported_toast">A webcím nem támogatott</string>
+    <string name="similar_videos_btn_text">Hasonló videók</string>
+<string name="use_external_video_player_title">Külső videólejátszó használata</string>
+    <string name="use_external_audio_player_title">Külső hanglejátszó használata</string>
+
+    <string name="download_path_audio_dialog_title">Adja meg a hangfájlok letöltési helyét.</string>
+
+    <string name="background_player_name">NewPipe Háttérlejátszó</string>
+    <string name="loading">Töltés</string>
+    <string name="use_tor_title">Tor használata</string>
+    <string name="use_tor_summary">Adatforgalom Tor-on keresztüli kényszerítése a biztonság fokozása érdekében (a videó stream-elés még nem támogatott)</string>
+
+    <string name="play_btn_text">Lejátszás</string>
+    <string name="network_error">Hálózati hiba</string>
+
+    <string name="background_player_playing_toast">Lejátszás háttérben</string>
+    <string name="settings_category_video_audio_title">Videó és audio</string>
+    <string name="settings_category_appearance_title">Megjelenés</string>
+    <string name="search_language_title">Tartalom preferált nyelve</string>
+    <string name="settings_category_other_title">További beállítások</string>
+    <string name="show_next_and_similar_title">Következő hasonló videók mutatása</string>
+    <string name="dark_theme_title">Sötét</string>
+    <string name="light_theme_title">Világos</string>
+
+    <string name="theme_title">Téma</string>
+    <string name="download_path_audio_title">Letöltött hangfájlok helye</string>
+    <string name="download_path_audio_summary">Útvonal a letöltött hangfájlok tárolásához.</string>
+    <string name="detail_likes_img_view_description">Tetszik</string>
+    <string name="detail_dislikes_img_view_description">Nem tetszik</string>
+    <string name="list_thumbnail_view_description">Videó előnézet</string>
+    <string name="detail_thumbnail_view_description">Videó előnézet</string>
+    <string name="detail_uploader_thumbnail_view_description">Fetöltő profilképe</string>
+    <string name="err_dir_create">Nem lehet létrehozni a letöltés mappát \'%1$s\'</string>
+    <string name="info_dir_created">Letöltés mappa létrehozása \'%1$s\'</string>
+</resources>

app/src/main/res/values-id

@@ -0,0 +1 @@
+values-in

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

@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+</resources>

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

@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s visite</string>
+    <string name="upload_date_text">Caricato in %1$s</string>
+    <string name="no_player_found">Nessun riproduttore trovato. Dovresti installarne uno.</string>
+    <string name="install">Installa</string>
+    <string name="cancel">Cancella</string>
+    <string name="open_in_browser">Apri nel browser</string>
+    <string name="share">Condividi</string>
+    <string name="download">Scarica</string>
+    <string name="search">Cerca</string>
+    <string name="settings">Impostazioni</string>
+    <string name="did_you_mean">"Intendevi: "</string>
+    <string name="search_page">"Cerca pagina: "</string>
+    <string name="share_dialog_title">Condividi con:</string>
+    <string name="choose_browser">Scegli browser:</string>
+    <string name="screen_rotation">rotazione</string>
+    <string name="settings_activity_title">Impostazioni</string>
+    <string name="useExternalPlayerTitle">Usa un riproduttore video esterno</string>
+    <string name="download_path_title">Cartella di download</string>
+    <string name="download_path_summary">Percorso dove memorizzare i video scaricati.</string>
+    <string name="download_path_dialog_title">Inserisci il percorso di download</string>
+    <string name="autoplay_through_intent_title">Auto riproduzione attraverso internet</string>
+    <string name="autoplay_through_intent_summary">Avvia automaticamente un video quando è stato chiamato da un\'altra applicazione.</string>
+    <string name="default_resolution_title">Risoluzione predefinita</string>
+    <string name="play_with_kodi_title">Riproduci con Kodi</string>
+    <string name="kore_not_found">Kore app non trovata. Kore è richiesto per riprodurre video con Kodi media center.</string>
+    <string name="installeKore">Installa Kore</string>
+    <string name="show_play_with_kodi_title">Mostra l\'opzione \"Riproduci con Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Mostra un opzione per riprodurre un video attraverso Kodi media center.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Formato audio predefinito</string>
+    <string name="webm_description">WedM &#8212; formato libero</string>
+    <string name="m4a_description">m4a &#8212; qualità migliore</string>
+    <string name="download_dialog_title">Scarica</string>
+    <string name="next_video_title">Prossimo video</string>
+    <string name="show_next_and_similar_title">Mostra i video successivi e simili</string>
+    <string name="url_not_supported_toast">URL non supportato.</string>
+    <string name="similar_videos_btn_text">Video simili</string>
+    <string name="search_language_title">Lingua preferita dei contenuti</string>
+    <string name="settings_category_video_audio_title">VIDEO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">ETC</string>
+
+    <string name="list_thumbnail_view_description">Anteprima video</string>
+    <string name="detail_thumbnail_view_description">Anteprima video</string>
+    <string name="detail_uploader_thumbnail_view_description">Miniatura caricata</string>
+    <string name="detail_dislikes_img_view_description">Non mi piace</string>
+    <string name="detail_likes_img_view_description">Mi piace</string>
+</resources>

app/src/main/res/values-iw

@@ -0,0 +1 @@
+values-he

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

@@ -1,50 +1,78 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="uploadDateText">"アップロード: "%1$s</string>
-    <string name="noPlayerFound">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
-    <string name="installStreamPlayer">ｲﾝｽﾄｰﾙ</string>
+    <string name="upload_date_text">"アップロード: "%1$s</string>
+    <string name="no_player_found">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
+    <string name="install">ｲﾝｽﾄｰﾙ</string>
     <string name="cancel">取り消し</string>
     <string name="open_in_browser">ﾌﾞﾗｳｻﾞｰで開く</string>
     <string name="share">共有</string>
     <string name="download">ﾀﾞｳﾝﾛｰﾄﾞ</string>
     <string name="search">検索</string>
     <string name="settings">設定</string>
-    <string name="didYouMean">"この意味ですか: "</string>
-    <string name="searchPage">"検索ﾍﾟｰｼﾞ: "</string>
-    <string name="shareDialogTitle">…共有:</string>
-    <string name="chooseBrowser">ﾌﾞﾗｳｻﾞｰを選択:</string>
-    <string name="screenRotation">回転</string>
-    <string name="title_activity_settings">設定</string>
+    <string name="did_you_mean">"この意味ですか: "</string>
+    <string name="search_page">"検索ﾍﾟｰｼﾞ: "</string>
+    <string name="share_dialog_title">…共有:</string>
+    <string name="choose_browser">ﾌﾞﾗｳｻﾞｰを選択:</string>
+    <string name="screen_rotation">回転</string>
+    <string name="settings_activity_title">設定</string>
     <string name="useExternalPlayerTitle">外部ﾌﾟﾚｰﾔｰを使用する</string>
-    <string name="downloadLocation">ﾀﾞｳﾝﾛｰﾄﾞする場所</string>
-    <string name="downloadLocationSummary">ﾀﾞｳﾝﾛｰﾄﾞした動画を保存する場所のﾊﾟｽ｡</string>
-    <string name="downloadLocationDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞのﾊﾟｽを入力してください｡</string>
-    <string name="autoPlayThroughIntentTitle">ｲﾝﾃﾝﾄで自動再生</string>
-    <string name="autoPlayThroughIntentSummary">他のｱﾌﾟﾘｹｰｼｮﾝから呼び出されたとき､自動的に動画再生を開始します｡</string>
-    <string name="defaultResolutionPreferenceTitle">基本の解像度</string>
-    <string name="playWithKodiTitle">Kodi で再生</string>
-    <string name="koreNotFound">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
+    <string name="download_path_title">動画をﾀﾞｳﾝﾛｰﾄﾞする場所</string>
+    <string name="download_path_summary">ﾀﾞｳﾝﾛｰﾄﾞした動画を保存する場所のﾊﾟｽ｡</string>
+    <string name="download_path_dialog_title">動画をﾀﾞｳﾝﾛｰﾄﾞするﾊﾟｽを入力してください</string>
+    <string name="autoplay_through_intent_title">ｲﾝﾃﾝﾄで自動再生</string>
+    <string name="autoplay_through_intent_summary">他のｱﾌﾟﾘｹｰｼｮﾝから呼び出されたとき､自動的に動画再生を開始します｡</string>
+    <string name="default_resolution_title">基本の解像度</string>
+    <string name="play_with_kodi_title">Kodi で再生</string>
+    <string name="kore_not_found">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
     <string name="installeKore">Kore をｲﾝｽﾄｰﾙ</string>
-    <string name="showPlayWithKodiTitle">\"Kodi で再生\" 設定を表示</string>
-    <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
-    <string name="leftPlayButtonTitle">左側に再生ﾎﾞﾀﾝを表示.</string>
-    <string name="playAudio">ｵｰﾃﾞｨｵ</string>
-    <string name="defaultAudioFormatTitle">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
-    <string name="webMAudioDescription">.WebM - ﾌﾘｰﾌｫｰﾏｯﾄ</string>
-    <string name="m4aAudioDescription">.m4a - より良い品質</string>
-    <string name="downloadDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞ</string>
-    <string name="nextVideoTitle">次の動画</string>
-    <string name="showNextAndSimilarTitle">次の同様の動画を表示します｡</string>
-    <string name="urlNotSupportedText">URL は使用できません｡</string>
-    <string name="showSimilarVideosButtonText">同様の動画</string>
-    <string name="searchLanguageTitle">優先される言語</string>
-    <string name="settingsCategoryVideoAudioTitle">動画とｵｰﾃﾞｨｵ</string>
-    <string name="settingsCategoryVideoInfoTittle">情報</string>
-    <string name="settingsCategoryEtcTitle">その他</string>
-<string name="viewCountText">%1$s ビュー</string>
-    <string name="itemThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
-    <string name="detailThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
-    <string name="detailUploaderThumbnailViewDescription">アップローダー サムネイル</string>
-    <string name="detailThumbsDownImgViewDescription">いいね解除</string>
-    <string name="detailThumbsUpImgViewDescription">いいね</string>
-</resources>
+    <string name="show_play_with_kodi_title">\"Kodi で再生\" 設定を表示</string>
+    <string name="show_play_with_kodi_summary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
+    <string name="play_audio">ｵｰﾃﾞｨｵ</string>
+    <string name="default_audio_format_title">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
+    <string name="webm_description">WebM — ﾌﾘｰﾌｫｰﾏｯﾄ</string>
+    <string name="m4a_description">m4a — より良い品質</string>
+    <string name="download_dialog_title">ﾀﾞｳﾝﾛｰﾄﾞ</string>
+    <string name="next_video_title">次の動画</string>
+    <string name="show_next_and_similar_title">次の同様の動画を表示します｡</string>
+    <string name="url_not_supported_toast">URL は使用できません｡</string>
+    <string name="similar_videos_btn_text">同様の動画</string>
+    <string name="search_language_title">優先される言語</string>
+    <string name="settings_category_video_audio_title">動画とｵｰﾃﾞｨｵ</string>
+    <string name="view_count_text">%1$s ビュー</string>
+    <string name="list_thumbnail_view_description">ビデオ プレビュー サムネイル</string>
+    <string name="detail_thumbnail_view_description">ビデオ プレビュー サムネイル</string>
+    <string name="detail_uploader_thumbnail_view_description">アップローダー サムネイル</string>
+    <string name="detail_dislikes_img_view_description">残念だね</string>
+    <string name="detail_likes_img_view_description">いいね</string>
+    <string name="use_external_video_player_title">外部ビデオ プレイヤーを使用する</string>
+    <string name="use_external_audio_player_title">外部オーディオ プレイヤーを使用する</string>
+    <string name="background_player_playing_toast">バックグラウンドで再生しています</string>
+
+    <string name="background_player_name">NewPipe バックグラウンド プレーヤー</string>
+    <string name="loading">読み込み中</string>
+    <string name="play_btn_text">再生</string>
+
+    <string name="use_tor_title">Tor を使用する</string>
+    <string name="use_tor_summary">強制的に Tor を経由したプライバシーを高めたトラフィックでダウンロードします (ビデオのストリーミングはまだサポートされていません)</string>
+<string name="theme_title">テーマ</string>
+    <string name="dark_theme_title">ダーク</string>
+    <string name="light_theme_title">ライト</string>
+
+    <string name="settings_category_appearance_title">外観</string>
+    <string name="settings_category_other_title">その他</string>
+    <string name="network_error">ﾈｯﾄﾜｰｸ ｴﾗｰ</string>
+
+    <string name="download_path_audio_title">ｵｰﾃﾞｨｵをﾀﾞｳﾝﾛｰﾄﾞするﾊﾟｽ</string>
+    <string name="download_path_audio_summary">ｵｰﾃﾞｨｵをﾀﾞｳﾝﾛｰﾄﾞするﾊﾟｽ｡</string>
+    <string name="download_path_audio_dialog_title">ｵｰﾃﾞｫﾌｧｲﾙをﾀﾞｳﾝﾛｰﾄﾞするﾊﾟｽを入力してください。</string>
+
+    <string name="err_dir_create">ﾀﾞｳﾝﾛｰﾄﾞ ﾃﾞｨﾚｸﾄﾘ \'%1$s\' を作成できません</string>
+    <string name="info_dir_created">ﾀﾞｳﾝﾛｰﾄﾞ ﾃﾞｨﾚｸﾄﾘ \'%1$s\' を作成しました</string>
+<string name="general_error">エラー</string>
+    <string name="could_not_load_thumbnails">すべてのサムネイルを読み込むことができません</string>
+    <string name="youtube_signature_decryption_error">ビデオの url 署名を復号化できませんでした。</string>
+    <string name="parsing_error">Web サイトを解析できませんでした。</string>
+    <string name="content_not_available">コンテンツがありません。</string>
+    <string name="blocked_by_gema">GEMA によってブロックされました。</string>
+
+    </resources>

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

@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">시청 횟수 %1$s</string>
+    <string name="upload_date_text">%1$s에 업로드됨</string>
+    <string name="no_player_found">스트리밍 플레이어가 발견되지 않았습니다. VLC를 설치할까요?</string>
+    <string name="install">설치</string>
+    <string name="cancel">취소</string>
+    <string name="open_in_browser">브라우저에서 열기</string>
+    <string name="share">공유</string>
+    <string name="download">다운로드</string>
+    <string name="search">검색</string>
+    <string name="settings">설정</string>
+    <string name="did_you_mean">"혹시 이것을 검색하셨습니까? "</string>
+    <string name="search_page">"검색 페이지: "</string>
+    <string name="share_dialog_title">다음으로 공유:</string>
+    <string name="choose_browser">브라우저 선택:</string>
+    <string name="screen_rotation">회전</string>
+    <string name="settings_activity_title">설정</string>
+    <string name="useExternalPlayerTitle">외부 플레이어 사용</string>
+    <string name="download_path_title">비디오 다운로드 위치</string>
+    <string name="download_path_summary">다운로드된 비디오가 저장될 경로를 선택하세요.</string>
+    <string name="download_path_dialog_title">비디오 다운로드 경로 입력</string>
+    <string name="autoplay_through_intent_title">인텐트로 경유할 경우 자동 재생</string>
+    <string name="autoplay_through_intent_summary">다른 앱으로부터 호출되었을 경우에 비디오를 자동으로 재생합니다.</string>
+    <string name="default_resolution_title">기본 해상도</string>
+    <string name="play_with_kodi_title">Kodi로 재생</string>
+    <string name="kore_not_found">Kore 앱이 발견되지 않았습니다. Kore를 설치할까요?</string>
+    <string name="installeKore">Kore 설치</string>
+    <string name="show_play_with_kodi_title">\"Kodi로 재생\" 옵션 표시</string>
+    <string name="show_play_with_kodi_summary">비디오를 Kodi media center를 사용해 재생하는 옵션을 표시합니다.</string>
+    <string name="play_audio">오디오</string>
+    <string name="default_audio_format_title">기본 오디오 포맷</string>
+    <string name="webm_description">WebM — 무료 자유 포맷입니다</string>
+    <string name="m4a_description">m4a — 보다 나은 품질</string>
+    <string name="download_dialog_title">다운로드</string>
+    <string name="next_video_title">다음 비디오</string>
+    <string name="show_next_and_similar_title">다음 및 유사한 비디오 표시</string>
+    <string name="url_not_supported_toast">지원하지 않는 URL 입니다</string>
+    <string name="similar_videos_btn_text">유사한 비디오</string>
+    <string name="search_language_title">선호하는 컨텐츠 언어</string>
+    <string name="settings_category_video_audio_title">비디오 &amp; 오디오</string>
+    <string name="settingsCategoryVideoInfoTittle">정보</string>
+    <string name="settingsCategoryEtcTitle">기타</string>
+
+    <string name="list_thumbnail_view_description">비디오 미리보기 썸네일</string>
+    <string name="detail_thumbnail_view_description">비디오 미리보기 썸네일</string>
+    <string name="detail_uploader_thumbnail_view_description">업로더 썸네일</string>
+    <string name="detail_dislikes_img_view_description">싫어요</string>
+    <string name="detail_likes_img_view_description">좋아요</string>
+<string name="background_player_name">NewPipe 백그라운드 플레이어</string>
+    <string name="loading">불러오는 중</string>
+    <string name="use_external_video_player_title">외부 비디오 플레이어 사용</string>
+    <string name="use_external_audio_player_title">외부 오디오 플레이어 사용</string>
+
+    <string name="download_path_audio_title">오디오 다운로드 경로</string>
+    <string name="download_path_audio_summary">다운로드된 오디오를 저장할 경로입니다.</string>
+    <string name="download_path_audio_dialog_title">오디오 파일 다운로드 경로를 입력하세요.</string>
+
+    <string name="theme_title">테마</string>
+    <string name="dark_theme_title">어두운 테마</string>
+    <string name="light_theme_title">밝은 테마</string>
+
+    <string name="settings_category_appearance_title">외관</string>
+    <string name="settings_category_other_title">기타</string>
+    <string name="background_player_playing_toast">백그라운드에서 재생 중</string>
+    <string name="play_btn_text">재생</string>
+    <string name="network_error">네트워크 오류</string>
+
+    <string name="use_tor_title">Tor 사용</string>
+    <string name="use_tor_summary">향상된 프라이버시를 위해 다운로드 트래픽을 강제로 Tor를 통해 전송 (스트리밍 비디오는 아직 지원되지 않습니다)</string>
+
+    <string name="err_dir_create">다운로드 디렉토리를 만들 수 없습니다 \'%1$s\'</string>
+    <string name="info_dir_created">다운로드 디렉토리를 만들었습니다 \'%1$s\'</string>
+</resources>