move on to version 0.9.2

move to version 0.9.2 of NewPipeExtractor
Merge branch 'fix-next-video' of git://github.com/mauriciocolli/NewPipe into mul
2025-09-29 17:01:04 +02:00 · 2017-04-11 22:51:04 +02:00 · 2017-04-11 22:49:18 +02:00 · 2017-04-11 22:26:41 +02:00 · 2017-04-11 18:56:03 +02:00 · 2017-04-11 00:46:21 +02:00
54 changed files with 2205 additions and 1503 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
        targetSdkVersion 25
-        versionCode 27
-        versionName "0.9.0"
+        versionCode 29
+        versionName "0.9.2"
    }
    buildTypes {
        release {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,22 +19,15 @@
        tools:ignore="AllowBackup">
        <activity
            android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:launchMode="singleTask">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-        <activity
-            android:name=".detail.VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail"
-            android:launchMode="singleTask"
-            android:theme="@style/AppTheme">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity" />
-        </activity>
+
        <activity
            android:name=".player.PlayVideoActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
@@ -50,7 +43,7 @@
            android:name=".player.ExoPlayerActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:label="@string/app_name"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
            android:theme="@style/PlayerTheme"/>

        <activity
@@ -87,9 +80,6 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:theme="@style/FilePickerTheme"/>
-        <activity
-            android:name=".ChannelActivity"
-            android:launchMode="singleTask" />
        <activity
            android:name=".ReCaptchaActivity"
            android:label="@string/reCaptchaActivity" />
@@ -104,7 +94,9 @@
                android:resource="@xml/provider_paths" />
        </provider>

-        <activity android:name=".RouterActivity"
+        <activity
+            android:name=".RouterActivity"
+            android:taskAffinity=""
            android:theme="@android:style/Theme.NoDisplay">
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@@ -161,7 +153,9 @@
            </intent-filter>
        </activity>

-        <activity android:name=".PopupActivity"
+        <activity
+            android:name=".RouterPopupActivity"
+            android:taskAffinity=""
            android:theme="@android:style/Theme.NoDisplay"
            android:label="@string/popup_mode_share_menu_title">
            <intent-filter>
@@ -182,9 +176,6 @@
                <data android:pathPrefix="/embed/" />
                <data android:pathPrefix="/watch" />
                <data android:pathPrefix="/attribution_link" />
-                <!-- channel prefix -->
-                <data android:pathPrefix="/channel/"/>
-                <data android:pathPrefix="/user/"/>
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
@@ -212,9 +203,7 @@
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.SEND" />
-
                <category android:name="android.intent.category.DEFAULT" />
-
                <data android:mimeType="text/plain" />
            </intent-filter>
        </activity>
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
--- a/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
+++ b/app/src/main/java/org/schabi/newpipe/ImageErrorLoadingListener.java
@@ -1,14 +1,14 @@
 package org.schabi.newpipe;

-import android.app.Activity;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.view.View;

 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;

-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.report.ErrorActivity;

 /**
 * Created by Christian Schabesberger on 01.08.16.
@@ -33,11 +33,11 @@ import org.schabi.newpipe.extractor.NewPipe;
 public class ImageErrorLoadingListener implements ImageLoadingListener {

    private int serviceId = -1;
-    private Activity activity = null;
+    private Context context = null;
    private View rootView = null;

-    public ImageErrorLoadingListener(Activity activity, View rootView, int serviceId) {
-        this.activity = activity;
+    public ImageErrorLoadingListener(Context context, View rootView, int serviceId) {
+        this.context = context;
        this.serviceId= serviceId;
        this.rootView = rootView;
    }
@@ -47,7 +47,7 @@ public class ImageErrorLoadingListener implements ImageLoadingListener {

    @Override
    public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-        ErrorActivity.reportError(activity,
+        ErrorActivity.reportError(context,
                failReason.getCause(), null, rootView,
                ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
                        NewPipe.getNameOfService(serviceId), imageUri,
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -1,54 +1,95 @@
+/*
+ * Created by Christian Schabesberger on 02.08.16.
+ * <p>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * DownloadActivity.java is part of NewPipe.
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * 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.Intent;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.NavUtils;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+
+import com.nostra13.universalimageloader.core.ImageLoader;
+
 import org.schabi.newpipe.download.DownloadActivity;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.fragments.channel.ChannelFragment;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+import org.schabi.newpipe.fragments.search.SearchFragment;
 import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;

-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * DownloadActivity.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 MainActivity extends AppCompatActivity {
-    private Fragment mainFragment = null;
+public class MainActivity extends AppCompatActivity implements OnItemSelectedListener {
    private static final String TAG = MainActivity.class.toString();

+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity's LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
        ThemeHelper.setTheme(this, true);
+        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
        setVolumeControlStream(AudioManager.STREAM_MUSIC);
-        mainFragment = getSupportFragmentManager()
-                .findFragmentById(R.id.search_fragment);
+        if (savedInstanceState == null) initFragments();
    }

+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    @Override
+    public void onBackPressed() {
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (fragment instanceof VideoDetailFragment) if (((VideoDetailFragment) fragment).onActivityBackPressed()) return;
+
+        if (getSupportFragmentManager().getBackStackEntryCount() >= 2) {
+            getSupportFragmentManager().popBackStackImmediate();
+        } else {
+            if (fragment instanceof SearchFragment) {
+                SearchFragment searchFragment = (SearchFragment) fragment;
+                if (!searchFragment.isMainBgVisible()) {
+                    getSupportFragmentManager().beginTransaction().remove(fragment).commitNow();
+                    NavigationHelper.openMainActivity(this);
+                    return;
+                }
+            }
+            finish();
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        super.onCreateOptionsMenu(menu);
@@ -63,9 +104,10 @@ public class MainActivity extends AppCompatActivity {

        switch (id) {
            case android.R.id.home: {
-                Intent intent = new Intent(this, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                NavUtils.navigateUpTo(this, intent);
+                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+                if (fragment instanceof VideoDetailFragment) ((VideoDetailFragment) fragment).clearHistory();
+
+                NavigationHelper.openMainActivity(this);
                return true;
            }
            case R.id.action_settings: {
@@ -85,4 +127,112 @@ public class MainActivity extends AppCompatActivity {
                return super.onOptionsItemSelected(item);
        }
    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initFragments() {
+        if (getIntent() != null && getIntent().hasExtra(Constants.KEY_URL)) {
+            handleIntent(getIntent());
+        } else openSearchFragment();
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnItemSelectedListener
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name) {
+        switch (linkType) {
+            case STREAM:
+                openVideoDetailFragment(serviceId, url, name, false);
+                break;
+            case CHANNEL:
+                openChannelFragment(serviceId, url, name);
+                break;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void handleIntent(Intent intent) {
+        if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
+            String url = intent.getStringExtra(Constants.KEY_URL);
+            int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
+            try {
+                switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
+                    case STREAM:
+                        handleVideoDetailIntent(serviceId, url, intent);
+                        break;
+                    case CHANNEL:
+                        handleChannelIntent(serviceId, url, intent);
+                        break;
+                    case NONE:
+                        throw new Exception("Url not known to service. service=" + Integer.toString(serviceId) + " url=" + url);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else {
+            getSupportFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            openSearchFragment();
+        }
+    }
+
+    private void openSearchFragment() {
+        ImageLoader.getInstance().clearMemoryCache();
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, new SearchFragment())
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void openVideoDetailFragment(int serviceId, String url, String title, boolean autoPlay) {
+        ImageLoader.getInstance().clearMemoryCache();
+
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        if (title == null) title = "";
+
+        if (fragment instanceof VideoDetailFragment && fragment.isVisible()) {
+            VideoDetailFragment detailFragment = (VideoDetailFragment) fragment;
+            detailFragment.setAutoplay(autoPlay);
+            detailFragment.selectAndLoadVideo(serviceId, url, title);
+            return;
+        }
+
+        VideoDetailFragment instance = VideoDetailFragment.getInstance(serviceId, url, title);
+        instance.setAutoplay(autoPlay);
+
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, instance)
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void openChannelFragment(int serviceId, String url, String name) {
+        ImageLoader.getInstance().clearMemoryCache();
+        if (name == null) name = "";
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
+                .replace(R.id.fragment_holder, ChannelFragment.newInstance(serviceId, url, name))
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private void handleVideoDetailIntent(int serviceId, String url, Intent intent) {
+        boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
+        String title = intent.getStringExtra(Constants.KEY_TITLE);
+        openVideoDetailFragment(serviceId, url, title, autoPlay);
+    }
+
+    private void handleChannelIntent(int serviceId, String url, Intent intent) {
+        String name = intent.getStringExtra(Constants.KEY_TITLE);
+        openChannelFragment(serviceId, url, name);
+    }
+
 }
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -3,19 +3,14 @@ package org.schabi.newpipe;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.util.Log;
 import android.widget.Toast;

-import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.NavigationHelper;

 import java.util.Collection;
 import java.util.HashSet;

-/**
+/*
 * Copyright (C) Christian Schabesberger 2017 <chris.schabesberger@mailbox.org>
 * RouterActivity .java is part of NewPipe.
 *
@@ -38,7 +33,7 @@ import java.util.HashSet;
 * to the part of the service which can handle the url.
 */
 public class RouterActivity extends Activity {
-    private static final String TAG = RouterActivity.class.toString();
+    //private static final String TAG = "RouterActivity"

    /**
     * Removes invisible separators (\p{Z}) and punctuation characters including
@@ -54,6 +49,25 @@ public class RouterActivity extends Activity {
        finish();
    }

+    private void handleIntent(Intent intent) {
+        String videoUrl = "";
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        try {
+            NavigationHelper.openByLink(this, videoUrl);
+        } catch (Exception e) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+        }
+    }

    private static String removeHeadingGibberish(final String input) {
        int start = 0;
@@ -107,50 +121,4 @@ public class RouterActivity extends Activity {
        return result.toArray(new String[result.size()]);
    }

-    private void handleIntent(Intent intent) {
-        String videoUrl = "";
-        StreamingService service = null;
-
-        // first gather data and find service
-        if (intent.getData() != null) {
-            // this means the video was called though another app
-            videoUrl = intent.getData().toString();
-        } else if(intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
-            //this means that vidoe was called through share menu
-            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
-            videoUrl = getUris(extraText)[0];
-        }
-
-        service = NewPipe.getServiceByUrl(videoUrl);
-        if(service == null) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
-                    .show();
-            return;
-        } else {
-            Intent callIntent = new Intent();
-            switch(service.getLinkTypeByUrl(videoUrl)) {
-                case CHANNEL:
-                    callIntent.setClass(this, ChannelActivity.class);
-                    break;
-                case STREAM:
-                    callIntent.setClass(this, VideoItemDetailActivity.class);
-                    callIntent.putExtra(VideoItemDetailActivity.AUTO_PLAY,
-                            PreferenceManager.getDefaultSharedPreferences(this)
-                                    .getBoolean(
-                                            getString(R.string.autoplay_through_intent_key), false));
-                    break;
-                case PLAYLIST:
-                    Log.e(TAG, "NOT YET DEFINED");
-                    break;
-                default:
-                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
-                            .show();
-                    return;
-            }
-
-            callIntent.putExtra(NavStack.URL, videoUrl);
-            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
-            startActivity(callIntent);
-        }
-    }
 }
--- a/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterPopupActivity.java
@@ -4,24 +4,22 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.Toast;

 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.player.PopupVideoPlayer;
-import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.PermissionHelper;

 import java.util.Collection;
 import java.util.HashSet;

 /**
- * This activity is thought to open video streams form an external app using the popup playser.
+ * This activity is thought to open video streams form an external app using the popup player.
 */
-
-public class PopupActivity extends Activity {
-    private static final String TAG = RouterActivity.class.toString();
+public class RouterPopupActivity extends Activity {
+    //private static final String TAG = "RouterPopupActivity";

    /**
     * Removes invisible separators (\p{Z}) and punctuation characters including
@@ -38,6 +36,45 @@ public class PopupActivity extends Activity {
    }


+    private void handleIntent(Intent intent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
+            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            return;
+        }
+        String videoUrl = "";
+        StreamingService service;
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        service = NewPipe.getServiceByUrl(videoUrl);
+        if (service == null) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        Intent callIntent = new Intent(this, PopupVideoPlayer.class);
+        switch (service.getLinkTypeByUrl(videoUrl)) {
+            case STREAM:
+                break;
+            default:
+                Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+                return;
+        }
+
+        callIntent.putExtra(Constants.KEY_URL, videoUrl);
+        callIntent.putExtra(Constants.KEY_SERVICE_ID, service.getServiceId());
+        startService(callIntent);
+    }
+
    private static String removeHeadingGibberish(final String input) {
        int start = 0;
        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
@@ -90,47 +127,4 @@ public class PopupActivity extends Activity {
        return result.toArray(new String[result.size()]);
    }

-    private void handleIntent(Intent intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
-            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
-            return;
-        }
-        String videoUrl = "";
-        StreamingService service = null;
-
-        // first gather data and find service
-        if (intent.getData() != null) {
-            // this means the video was called though another app
-            videoUrl = intent.getData().toString();
-        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
-            //this means that vidoe was called through share menu
-            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
-            videoUrl = getUris(extraText)[0];
-        }
-
-        service = NewPipe.getServiceByUrl(videoUrl);
-        if (service == null) {
-            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
-                    .show();
-            return;
-        } else {
-            Intent callIntent = new Intent();
-            switch (service.getLinkTypeByUrl(videoUrl)) {
-                case STREAM:
-                    callIntent.setClass(this, PopupVideoPlayer.class);
-                    break;
-                case PLAYLIST:
-                    Log.e(TAG, "NOT YET DEFINED");
-                    break;
-                default:
-                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
-                    return;
-            }
-
-            callIntent.putExtra(NavStack.URL, videoUrl);
-            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
-            startService(callIntent);
-        }
-    }
 }
--- a/app/src/main/java/org/schabi/newpipe/detail/StreamExtractorWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/StreamExtractorWorker.java
@@ -1,250 +0,0 @@
-package org.schabi.newpipe.detail;
-
-import android.app.Activity;
-import android.os.Handler;
-import android.util.Log;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.report.ErrorActivity;
-
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Extract {@link StreamInfo} with {@link StreamExtractor} from the given url of the given service
- */
-@SuppressWarnings("WeakerAccess")
-public class StreamExtractorWorker extends Thread {
-    private static final String TAG = "StreamExtractorWorker";
-
-    private Activity activity;
-    private final String videoUrl;
-    private final int serviceId;
-    private OnStreamInfoReceivedListener callback;
-
-    private final AtomicBoolean isRunning = new AtomicBoolean(false);
-    private final Handler handler = new Handler();
-
-
-    public interface OnStreamInfoReceivedListener {
-        void onReceive(StreamInfo info);
-        void onError(int messageId);
-        void onReCaptchaException();
-        void onBlockedByGemaError();
-        void onContentErrorWithMessage(int messageId);
-        void onContentError();
-    }
-
-    public StreamExtractorWorker(Activity activity, String videoUrl, int serviceId, OnStreamInfoReceivedListener callback) {
-        this.serviceId = serviceId;
-        this.videoUrl = videoUrl;
-        this.activity = activity;
-        this.callback = callback;
-    }
-
-    /**
-     * Returns a new instance <b>already</b> started  of {@link StreamExtractorWorker}.<br>
-     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()} it
-     *
-     * @param serviceId id of the request service
-     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
-     * @param activity  activity for error reporting purposes
-     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
-     * @return new instance already started of {@link StreamExtractorWorker}
-     */
-    public static StreamExtractorWorker startExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
-        StreamExtractorWorker extractorThread = getExtractorThread(serviceId, url, activity, callback);
-        extractorThread.start();
-        return extractorThread;
-    }
-
-    /**
-     * Returns a new instance of {@link StreamExtractorWorker}.<br>
-     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()}
-     * when it doesn't need it anymore
-     * <p>
-     * <b>Note:</b> this instance is <b>not</b> started yet
-     *
-     * @param serviceId id of the request service
-     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
-     * @param activity  activity for error reporting purposes
-     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
-     * @return instance of {@link StreamExtractorWorker}
-     */
-    public static StreamExtractorWorker getExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
-        return new StreamExtractorWorker(activity, url, serviceId, callback);
-    }
-
-    @Override
-    //Just ignore the errors for now
-    @SuppressWarnings("ConstantConditions")
-    public void run() {
-        // TODO: Improve error checking
-        // and this method in general
-
-        StreamInfo streamInfo = null;
-        StreamingService service;
-        try {
-            service = NewPipe.getService(serviceId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                            "", videoUrl, R.string.could_not_get_stream));
-            return;
-        }
-        try {
-            isRunning.set(true);
-            StreamExtractor streamExtractor = service.getExtractorInstance(videoUrl);
-            streamInfo = StreamInfo.getVideoInfo(streamExtractor);
-
-            final StreamInfo info = streamInfo;
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onReceive(info);
-                }
-            });
-            isRunning.set(false);
-            // look for errors during extraction
-            // this if statement only covers extra information.
-            // if these are not available or caused an error, they are just not available
-            // but don't render the stream information unusalbe.
-            if (streamInfo != null && !streamInfo.errors.isEmpty()) {
-                Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
-                for (Throwable e : streamInfo.errors) {
-                    e.printStackTrace();
-                    Log.e(TAG, "------");
-                }
-
-                View rootView = activity != null ? activity.findViewById(R.id.video_item_detail) : null;
-                ErrorActivity.reportError(handler, activity,
-                        streamInfo.errors, null, rootView,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
-            }
-
-            // These errors render the stream information unusable.
-        } catch (ReCaptchaException e) {
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onReCaptchaException();
-                }
-            });
-        } catch (IOException e) {
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onError(R.string.network_error);
-                }
-            });
-            if (callback != null) e.printStackTrace();
-        } catch (YoutubeStreamExtractor.DecryptException de) {
-            // custom service related exceptions
-            ErrorActivity.reportError(handler, activity, de, VideoItemDetailActivity.class, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                            service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    activity.finish();
-                }
-            });
-            de.printStackTrace();
-        } catch (YoutubeStreamExtractor.GemaException ge) {
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onBlockedByGemaError();
-                }
-            });
-        } catch (YoutubeStreamExtractor.LiveStreamException e) {
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
-                }
-            });
-        }
-        // ----------------------------------------
-        catch (StreamExtractor.ContentNotAvailableException e) {
-            if (callback != null) handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    callback.onContentError();
-                }
-            });
-            e.printStackTrace();
-        } catch (StreamInfo.StreamExctractException e) {
-            if (!streamInfo.errors.isEmpty()) {
-                // !!! if this case ever kicks in someone gets kicked out !!!
-                ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-            } else {
-                ErrorActivity.reportError(handler, activity, streamInfo.errors, VideoItemDetailActivity.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-            }
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    activity.finish();
-                }
-            });
-            e.printStackTrace();
-        } catch (ParsingException e) {
-            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                            service.getServiceInfo().name, videoUrl, R.string.parsing_error));
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    activity.finish();
-                }
-            });
-            e.printStackTrace();
-        } catch (Exception e) {
-            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
-                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                            service.getServiceInfo().name, videoUrl, R.string.general_error));
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    activity.finish();
-                }
-            });
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Return true if the extraction is not completed yet
-     *
-     * @return the value of the AtomicBoolean {@link #isRunning}
-     */
-    public boolean isRunning() {
-        return isRunning.get();
-    }
-
-    /**
-     * Cancel this ExtractorThread, setting the callback to null, the AtomicBoolean {@link #isRunning} to false and interrupt this thread.
-     * <p>
-     * <b>Note:</b> Any I/O that is active in the moment that this method is called will be canceled and a Exception will be thrown, because of the {@link #interrupt()}.<br>
-     * This is useful when you don't want the resulting {@link StreamInfo} anymore, but don't want to waste bandwidth, otherwise it'd run till it receives the StreamInfo.
-     */
-    public void cancel() {
-        this.callback = null;
-        this.isRunning.set(false);
-        this.interrupt();
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/extractor
+++ b/app/src/main/java/org/schabi/newpipe/extractor
--- a/app/src/main/java/org/schabi/newpipe/fragments/OnItemSelectedListener.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/OnItemSelectedListener.java
@@ -0,0 +1,10 @@
+package org.schabi.newpipe.fragments;
+
+import org.schabi.newpipe.extractor.StreamingService;
+
+/**
+ * Interface for communication purposes between activity and fragment
+ */
+public interface OnItemSelectedListener {
+    void onItemSelected(StreamingService.LinkType linkType, int serviceId, String url, String name);
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/channel/ChannelFragment.java
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/ActionBarHandler.java
@@ -1,6 +1,5 @@
-package org.schabi.newpipe.detail;
+package org.schabi.newpipe.fragments.detail;

-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
@@ -12,9 +11,9 @@ import android.view.MenuItem;
 import android.widget.ArrayAdapter;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.util.Utils;

 import java.util.List;

@@ -50,7 +49,7 @@ class ActionBarHandler {
    private Menu menu;

    // 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.
+    // those are edited directly. Typically VideoDetailFragment will implement those callbacks.
    private OnActionListener onShareListener;
    private OnActionListener onOpenInBrowserListener;
    private OnActionListener onOpenInPopupListener;
@@ -89,7 +88,7 @@ class ActionBarHandler {
                VideoStream item = videoStreams.get(i);
                itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
            }
-            int defaultResolution = getDefaultResolution(videoStreams);
+            int defaultResolution = Utils.getPreferredResolution(activity, videoStreams);

            ArrayAdapter<String> itemAdapter = new ArrayAdapter<>(activity.getBaseContext(),
                    android.R.layout.simple_spinner_dropdown_item, itemArray);
@@ -110,26 +109,6 @@ class ActionBarHandler {
        }
    }

-
-    private int getDefaultResolution(final List<VideoStream> videoStreams) {
-        if (defaultPreferences == null)
-            return 0;
-
-        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++) {
-            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) {
        this.menu = menu;

@@ -170,11 +149,6 @@ class ActionBarHandler {
                    onDownloadListener.onActionSelected(selectedVideoStream);
                }
                return true;
-            case R.id.action_settings: {
-                Intent intent = new Intent(activity, SettingsActivity.class);
-                activity.startActivity(intent);
-                return true;
-            }
            case R.id.action_play_with_kodi:
                if(onPlayWithKodiListener != null) {
                    onPlayWithKodiListener.onActionSelected(selectedVideoStream);
@@ -185,12 +159,6 @@ class ActionBarHandler {
                    onPlayAudioListener.onActionSelected(selectedVideoStream);
                }
                return true;
-            case R.id.menu_item_downloads: {
-                Intent intent =
-                        new Intent(activity, org.schabi.newpipe.download.DownloadActivity.class);
-                activity.startActivity(intent);
-                return true;
-            }
            case R.id.menu_item_popup: {
                if(onOpenInPopupListener != null) {
                    onOpenInPopupListener.onActionSelected(selectedVideoStream);
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
@@ -0,0 +1,31 @@
+package org.schabi.newpipe.fragments.detail;
+
+import java.io.Serializable;
+
+
+@SuppressWarnings("WeakerAccess")
+public class StackItem implements Serializable {
+    private String title, url;
+
+    public StackItem(String url, String title) {
+        this.title = title;
+        this.url = url;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    @Override
+    public String toString() {
+        return getUrl() + " > " + getTitle();
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
--- a/app/src/main/java/org/schabi/newpipe/fragments/search/SearchSuggestionListener.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/search/SearchSuggestionListener.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.search_fragment;
+package org.schabi.newpipe.fragments.search;

 import android.support.v7.widget.SearchView;

--- a/app/src/main/java/org/schabi/newpipe/fragments/search/SearchWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/search/SearchWorker.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.search_fragment;
+package org.schabi.newpipe.fragments.search;

 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -7,13 +7,13 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;

+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;

 import java.io.IOException;
 import java.util.EnumSet;
@@ -209,6 +209,7 @@ public class SearchWorker {
    }

    public void terminate() {
+        if (runnable == null) return;
        requestId++;
        runnable.terminate();
    }
--- a/app/src/main/java/org/schabi/newpipe/fragments/search/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/search/SuggestionListAdapter.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.search_fragment;
+package org.schabi.newpipe.fragments.search;

 import android.content.Context;
 import android.database.Cursor;
--- a/app/src/main/java/org/schabi/newpipe/fragments/search/SuggestionSearchRunnable.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/search/SuggestionSearchRunnable.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.search_fragment;
+package org.schabi.newpipe.fragments.search;

 import android.app.Activity;
 import android.content.SharedPreferences;
@@ -6,11 +6,11 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.widget.Toast;

-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.SuggestionExtractor;
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.SuggestionExtractor;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.report.ErrorActivity;

 import java.io.IOException;
 import java.util.List;
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -1,11 +1,10 @@
 package org.schabi.newpipe.info_list;

-import android.app.Activity;
+import android.content.Context;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;

 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -39,20 +38,21 @@ import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;

 public class InfoItemBuilder {

-    final String viewsS;
-    final String videosS;
-    final String subsS;
+    private final String viewsS;
+    private final String videosS;
+    private final String subsS;
+    private final String subsPluralS;

-    final String thousand;
-    final String million;
-    final String billion;
+    private final String thousand;
+    private final String million;
+    private final String billion;

    private static final String TAG = InfoItemBuilder.class.toString();
    public interface OnInfoItemSelectedListener {
-        void selected(String url, int serviceId);
+        void selected(int serviceId, String url, String title);
    }

-    private Activity activity = null;
+    private Context mContext = null;
    private View rootView = null;
    private ImageLoader imageLoader = ImageLoader.getInstance();
    private DisplayImageOptions displayImageOptions =
@@ -60,15 +60,16 @@ public class InfoItemBuilder {
    private OnInfoItemSelectedListener onStreamInfoItemSelectedListener;
    private OnInfoItemSelectedListener onChannelInfoItemSelectedListener;

-    public InfoItemBuilder(Activity a, View rootView) {
-        activity = a;
+    public InfoItemBuilder(Context context, View rootView) {
+        mContext = context;
        this.rootView = rootView;
-        viewsS = a.getString(R.string.views);
-        videosS = a.getString(R.string.videos);
-        subsS = a.getString(R.string.subscriber);
-        thousand = a.getString(R.string.short_thousand);
-        million = a.getString(R.string.short_million);
-        billion = a.getString(R.string.short_billion);
+        viewsS = context.getString(R.string.views);
+        videosS = context.getString(R.string.videos);
+        subsS = context.getString(R.string.subscriber);
+        subsPluralS = context.getString(R.string.subscriber_plural);
+        thousand = context.getString(R.string.short_thousand);
+        million = context.getString(R.string.short_million);
+        billion = context.getString(R.string.short_billion);
    }

    public void setOnStreamInfoItemSelectedListener(
@@ -156,13 +157,13 @@ public class InfoItemBuilder {
            imageLoader.displayImage(info.thumbnail_url,
                    holder.itemThumbnailView,
                    displayImageOptions,
-                    new ImageErrorLoadingListener(activity, rootView, info.service_id));
+                    new ImageErrorLoadingListener(mContext, rootView, info.service_id));
        }

        holder.itemButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
-                onStreamInfoItemSelectedListener.selected(info.webpage_url, info.service_id);
+                onStreamInfoItemSelectedListener.selected(info.service_id, info.webpage_url, info.getTitle());
            }
        });
    }
@@ -178,13 +179,13 @@ public class InfoItemBuilder {
            imageLoader.displayImage(info.thumbnailUrl,
                    holder.itemThumbnailView,
                    displayImageOptions,
-                    new ImageErrorLoadingListener(activity, rootView, info.serviceId));
+                    new ImageErrorLoadingListener(mContext, rootView, info.serviceId));
        }

        holder.itemButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
-                onChannelInfoItemSelectedListener.selected(info.getLink(), info.serviceId);
+                onChannelInfoItemSelectedListener.selected(info.serviceId, info.getLink(), info.channelName);
            }
        });
    }
@@ -202,15 +203,17 @@ public class InfoItemBuilder {
        }
    }

-    public String shortSubscriber(Long count){
-        if(count >= 1000000000){
-            return Long.toString(count/1000000000)+ billion + " " + subsS;
-        }else if(count>=1000000){
-            return Long.toString(count/1000000)+ million + " " + subsS;
-        }else if(count>=1000){
-            return Long.toString(count/1000)+ thousand + " " + subsS;
-        }else {
-            return Long.toString(count)+ " " + subsS;
+    public String shortSubscriber(Long count) {
+        String curSubString = count > 1 ? subsPluralS : subsS;
+
+        if (count >= 1000000000) {
+            return Long.toString(count / 1000000000) + billion + " " + curSubString;
+        } else if (count >= 1000000) {
+            return Long.toString(count / 1000000) + million + " " + curSubString;
+        } else if (count >= 1000) {
+            return Long.toString(count / 1000) + thousand + " " + curSubString;
+        } else {
+            return Long.toString(count) + " " + curSubString;
        }
    }

--- a/app/src/main/java/org/schabi/newpipe/player/AbstractPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/AbstractPlayer.java
@@ -299,7 +299,6 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
            return;
        }

-        changeState(STATE_LOADING);
        isPrepared = false;
        qualityChanged = false;

@@ -312,6 +311,7 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
        if (videoStartPos > 0) simpleExoPlayer.seekTo(videoStartPos);
        simpleExoPlayer.prepare(videoSource);
        simpleExoPlayer.setPlayWhenReady(autoPlay);
+        changeState(STATE_LOADING);
    }

    public void destroy() {
@@ -396,7 +396,6 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) playbackSeekBar.getThumb().setColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);

        animateView(endScreen, false, 0, 0);
-        animateView(controlsRoot, false, 0, 0);
        loadingPanel.setBackgroundColor(Color.BLACK);
        animateView(loadingPanel, true, 0, 0);
        animateView(surfaceForeground, true, 100, 0);
@@ -408,7 +407,12 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
        if (!isProgressLoopRunning.get()) startProgressLoop();
        showAndAnimateControl(-1, true);
        loadingPanel.setVisibility(View.GONE);
-        animateView(controlsRoot, false, 500, DEFAULT_CONTROLS_HIDE_TIME, true);
+        animateView(controlsRoot, true, 500, 0, new Runnable() {
+            @Override
+            public void run() {
+                animateView(controlsRoot, false, 500, DEFAULT_CONTROLS_HIDE_TIME, true);
+            }
+        });
        animateView(currentDisplaySeek, false, 200, 0);
    }

@@ -417,7 +421,6 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
        if (DEBUG) Log.d(TAG, "onBuffering() called");
        loadingPanel.setBackgroundColor(Color.TRANSPARENT);
        animateView(loadingPanel, true, 500, 0);
-        animateView(controlsRoot, false, 0, 0, true);
    }

    @Override
@@ -598,14 +601,12 @@ public abstract class AbstractPlayer implements StateInterface, SeekBar.OnSeekBa
        if (DEBUG) Log.d(TAG, "onFastRewind() called");
        seekBy(-FAST_FORWARD_REWIND_AMOUNT);
        showAndAnimateControl(R.drawable.ic_action_av_fast_rewind, true);
-        animateView(controlsRoot, false, 100, 0);
    }

    public void onFastForward() {
        if (DEBUG) Log.d(TAG, "onFastForward() called");
        seekBy(FAST_FORWARD_REWIND_AMOUNT);
        showAndAnimateControl(R.drawable.ic_action_av_fast_forward, true);
-        animateView(controlsRoot, false, 100, 0);
    }

    /*//////////////////////////////////////////////////////////////////////////
--- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java
@@ -24,9 +24,10 @@ import android.widget.Toast;

 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.util.Constants;

 import java.io.IOException;
 import java.util.Arrays;
@@ -353,10 +354,11 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
                    new Intent(ACTION_REWIND), PendingIntent.FLAG_UPDATE_CURRENT);

            //build intent to return to video, on tapping notification
-            Intent openDetailViewIntent = new Intent(getApplicationContext(),
-                    VideoItemDetailActivity.class);
-            openDetailViewIntent.putExtra(NavStack.SERVICE_ID, serviceId);
-            openDetailViewIntent.putExtra(NavStack.URL, webUrl);
+            Intent openDetailViewIntent = new Intent(getApplicationContext(), MainActivity.class);
+            openDetailViewIntent.putExtra(Constants.KEY_SERVICE_ID, serviceId);
+            openDetailViewIntent.putExtra(Constants.KEY_URL, webUrl);
+            openDetailViewIntent.putExtra(Constants.KEY_TITLE, title);
+            openDetailViewIntent.putExtra(Constants.KEY_LINK_TYPE, StreamingService.LinkType.STREAM);
            openDetailViewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
            PendingIntent openDetailView = PendingIntent.getActivity(owner, noteID,
                    openDetailViewIntent, PendingIntent.FLAG_UPDATE_CURRENT);
--- a/app/src/main/java/org/schabi/newpipe/player/ExoPlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ExoPlayerActivity.java
@@ -24,7 +24,6 @@ import android.widget.TextView;
 import android.widget.Toast;

 import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.NavStack;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;

@@ -70,6 +69,7 @@ public class ExoPlayerActivity extends Activity {
            return;
        }

+        showSystemUi();
        setContentView(R.layout.activity_exo_player);
        playerImpl = new AbstractPlayerImpl();
        playerImpl.setup(findViewById(android.R.id.content));
@@ -88,7 +88,6 @@ public class ExoPlayerActivity extends Activity {
    public void onBackPressed() {
        if (DEBUG) Log.d(TAG, "onBackPressed() called");
        super.onBackPressed();
-        if (playerImpl.isStartedFromNewPipe()) NavStack.getInstance().openDetailActivity(this, playerImpl.getVideoUrl(), 0);
        if (playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(false);
    }

@@ -340,8 +339,7 @@ public class ExoPlayerActivity extends Activity {
        public void onStopTrackingTouch(SeekBar seekBar) {
            super.onStopTrackingTouch(seekBar);
            if (playerImpl.wasPlaying()) {
-                hideSystemUi();
-                playerImpl.getControlsRoot().setVisibility(View.GONE);
+                animateView(playerImpl.getControlsRoot(), false, 100, 0);
            }
        }

@@ -365,6 +363,13 @@ public class ExoPlayerActivity extends Activity {
        public void onLoading() {
            super.onLoading();
            playPauseButton.setImageResource(R.drawable.ic_pause_white);
+            animateView(playPauseButton, false, 100, 0);
+        }
+
+        @Override
+        public void onBuffering() {
+            super.onBuffering();
+            animateView(playPauseButton, false, 100, 0);
        }

        @Override
@@ -384,6 +389,7 @@ public class ExoPlayerActivity extends Activity {
        public void onPlaying() {
            super.onPlaying();
            animateView(playPauseButton, true, 500, 0);
+            showSystemUi();
        }

        @Override
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -34,16 +34,17 @@ import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListene

 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
 import org.schabi.newpipe.extractor.stream_info.StreamInfo;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
-import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.Utils;

 import java.io.IOException;
 import java.util.ArrayList;
@@ -107,7 +108,7 @@ public class PopupVideoPlayer extends Service {
        if (!playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(true);

        if (imageLoader != null) imageLoader.clearMemoryCache();
-        if (intent.getStringExtra(NavStack.URL) != null) {
+        if (intent.getStringExtra(Constants.KEY_URL) != null) {
            playerImpl.setStartedFromNewPipe(false);
            Thread fetcher = new Thread(new FetcherRunnable(intent));
            fetcher.start();
@@ -158,7 +159,7 @@ public class PopupVideoPlayer extends Service {
                        playerImpl.onVideoPlayPause();
                        break;
                    case ACTION_OPEN_DETAIL:
-                        onOpenDetail(PopupVideoPlayer.this, playerImpl.getVideoUrl());
+                        onOpenDetail(PopupVideoPlayer.this, playerImpl.getVideoUrl(), playerImpl.getVideoTitle());
                        break;
                    case ACTION_REPEAT:
                        playerImpl.onRepeatClicked();
@@ -266,12 +267,14 @@ public class PopupVideoPlayer extends Service {
        stopSelf();
    }

-    public void onOpenDetail(Context context, String videoUrl) {
+    public void onOpenDetail(Context context, String videoUrl, String videoTitle) {
        if (DEBUG) Log.d(TAG, "onOpenDetail() called with: context = [" + context + "], videoUrl = [" + videoUrl + "]");
-        Intent i = new Intent(context, VideoItemDetailActivity.class);
-        i.putExtra(NavStack.SERVICE_ID, 0)
-                .putExtra(NavStack.URL, videoUrl)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Intent i = new Intent(context, MainActivity.class);
+        i.putExtra(Constants.KEY_SERVICE_ID, 0);
+        i.putExtra(Constants.KEY_URL, videoUrl);
+        i.putExtra(Constants.KEY_TITLE, videoTitle);
+        i.putExtra(Constants.KEY_LINK_TYPE, StreamingService.LinkType.STREAM);
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        context.startActivity(i);
        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
    }
@@ -510,8 +513,6 @@ public class PopupVideoPlayer extends Service {
    private class FetcherRunnable implements Runnable {
        private final Intent intent;
        private final Handler mainHandler;
-        private final boolean printStreams = true;
-

        FetcherRunnable(Intent intent) {
            this.intent = intent;
@@ -524,48 +525,22 @@ public class PopupVideoPlayer extends Service {
            try {
                StreamingService service = NewPipe.getService(0);
                if (service == null) return;
-                streamExtractor = service.getExtractorInstance(intent.getStringExtra(NavStack.URL));
+                streamExtractor = service.getExtractorInstance(intent.getStringExtra(Constants.KEY_URL));
                StreamInfo info = StreamInfo.getVideoInfo(streamExtractor);
-                String defaultResolution = playerImpl.getSharedPreferences().getString(
-                        getResources().getString(R.string.default_resolution_key),
-                        getResources().getString(R.string.default_resolution_value));
-
-                VideoStream chosen = null, secondary = null, fallback = null;
                playerImpl.setVideoStreamsList(info.video_streams instanceof ArrayList
                        ? (ArrayList<VideoStream>) info.video_streams
                        : new ArrayList<>(info.video_streams));

-                for (VideoStream item : info.video_streams) {
-                    if (DEBUG && printStreams) {
-                        Log.d(TAG, "FetcherRunnable.StreamExtractor: current Item"
-                                + ", item.resolution = " + item.resolution
-                                + ", item.format = " + item.format
-                                + ", item.url = " + item.url);
-                    }
-                    if (defaultResolution.equals(item.resolution)) {
-                        if (item.format == MediaFormat.MPEG_4.id) {
-                            chosen = item;
-                            if (DEBUG) Log.d(TAG, "FetcherRunnable.StreamExtractor: CHOSEN item, item.resolution = " + item.resolution + ", item.format = " + item.format + ", item.url = " + item.url);
-                        } else if (item.format == 2) secondary = item;
-                        else fallback = item;
-                    }
+                int defaultResolution = Utils.getPreferredResolution(PopupVideoPlayer.this, info.video_streams);
+                playerImpl.setSelectedIndexStream(defaultResolution);
+
+                if (DEBUG) {
+                    Log.d(TAG, "FetcherRunnable.StreamExtractor: chosen = "
+                            + MediaFormat.getNameById(info.video_streams.get(defaultResolution).format) + " "
+                            + info.video_streams.get(defaultResolution).resolution + " > "
+                            + info.video_streams.get(defaultResolution).url);
                }

-                int selectedIndexStream;
-
-                if (chosen != null) selectedIndexStream = info.video_streams.indexOf(chosen);
-                else if (secondary != null) selectedIndexStream = info.video_streams.indexOf(secondary);
-                else if (fallback != null) selectedIndexStream = info.video_streams.indexOf(fallback);
-                else selectedIndexStream = 0;
-
-                playerImpl.setSelectedIndexStream(selectedIndexStream);
-
-                if (DEBUG && printStreams) Log.d(TAG, "FetcherRunnable.StreamExtractor: chosen = " + chosen
-                        + "\n, secondary = " + secondary
-                        + "\n, fallback = " + fallback
-                        + "\n, info.video_streams.get(0).url = " + info.video_streams.get(0).url);
-
-
                playerImpl.setVideoUrl(info.webpage_url);
                playerImpl.setVideoTitle(info.title);
                playerImpl.setChannelName(info.uploader);
@@ -578,6 +553,8 @@ public class PopupVideoPlayer extends Service {
                        playerImpl.playVideo(playerImpl.getSelectedStreamUri(), true);
                    }
                });
+
+                imageLoader.resume();
                imageLoader.loadImage(info.thumbnail_url, displayImageOptions, new SimpleImageLoadingListener() {
                    @Override
                    public void onLoadingComplete(String imageUri, View view, final Bitmap loadedImage) {
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -22,6 +22,7 @@ import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;

 import java.util.ArrayList;
+import java.util.List;

 import info.guardianproject.netcipher.proxy.OrbotHelper;

@@ -52,6 +53,7 @@ public class SettingsFragment  extends PreferenceFragment
    SharedPreferences.OnSharedPreferenceChangeListener prefListener;
    // get keys
    String DEFAULT_RESOLUTION_PREFERENCE;
+    String PREFERRED_VIDEO_FORMAT_PREFERENCE;
    String DEFAULT_AUDIO_FORMAT_PREFERENCE;
    String SEARCH_LANGUAGE_PREFERENCE;
    String DOWNLOAD_PATH_PREFERENCE;
@@ -59,6 +61,7 @@ public class SettingsFragment  extends PreferenceFragment
    String USE_TOR_KEY;
    String THEME;
    private ListPreference defaultResolutionPreference;
+    private ListPreference preferredVideoFormatPreference;
    private ListPreference defaultAudioFormatPreference;
    private ListPreference searchLanguagePreference;
    private Preference downloadPathPreference;
@@ -77,6 +80,7 @@ public class SettingsFragment  extends PreferenceFragment

        // get keys
        DEFAULT_RESOLUTION_PREFERENCE = getString(R.string.default_resolution_key);
+        PREFERRED_VIDEO_FORMAT_PREFERENCE = getString(R.string.preferred_video_format_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);
@@ -87,6 +91,8 @@ public class SettingsFragment  extends PreferenceFragment
        // get pref objects
        defaultResolutionPreference =
                (ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
+        preferredVideoFormatPreference =
+                (ListPreference) findPreference(PREFERRED_VIDEO_FORMAT_PREFERENCE);
        defaultAudioFormatPreference =
                (ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
        searchLanguagePreference =
@@ -254,6 +260,9 @@ public class SettingsFragment  extends PreferenceFragment
        defaultResolutionPreference.setSummary(
                defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
                        getString(R.string.default_resolution_value)));
+        preferredVideoFormatPreference.setSummary(
+                defaultPreferences.getString(PREFERRED_VIDEO_FORMAT_PREFERENCE,
+                        getString(R.string.preferred_video_format_default)));
        defaultAudioFormatPreference.setSummary(
                defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
                        getString(R.string.default_audio_format_value)));
--- a/app/src/main/java/org/schabi/newpipe/util/Constants.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Constants.java
@@ -0,0 +1,8 @@
+package org.schabi.newpipe.util;
+
+public class Constants {
+    public static final String KEY_SERVICE_ID = "key_service_id";
+    public static final String KEY_URL = "key_url";
+    public static final String KEY_TITLE = "key_title";
+    public static final String KEY_LINK_TYPE = "key_link_type";
+}
--- a/app/src/main/java/org/schabi/newpipe/util/NavStack.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavStack.java
@@ -1,148 +0,0 @@
-package org.schabi.newpipe.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-
-import org.schabi.newpipe.ChannelActivity;
-import org.schabi.newpipe.MainActivity;
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-
-import java.util.ArrayList;
-import java.util.Stack;
-
-/**
- * Created by Christian Schabesberger on 16.02.17.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * NavStack.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * class helps to navigate within the app
- * IMPORTAND: the top of the stack is the current activity !!!
- */
-public class NavStack {
-    private static final String TAG = NavStack.class.toString();
-    public static final String SERVICE_ID = "service_id";
-    public static final String URL = "url";
-
-    private static final String NAV_STACK="nav_stack";
-
-    private enum ActivityId {
-        CHANNEL,
-        DETAIL
-    }
-
-    private class NavEntry {
-        public NavEntry(String url, int serviceId) {
-            this.url = url;
-            this.serviceId = serviceId;
-        }
-        public String url;
-        public int serviceId;
-    }
-
-    private static NavStack instance = new NavStack();
-    private Stack<NavEntry> stack = new Stack<NavEntry>();
-
-    private NavStack() {
-    }
-
-    public static NavStack getInstance() {
-        return instance;
-    }
-
-    public void navBack(Activity activity) throws Exception {
-        if(stack.size() == 0) { // if stack is already empty here, activity was probably called
-            // from another app
-            activity.finish();
-            return;
-        }
-        stack.pop(); // remove curent activty, since we dont want to return to itself
-        if (stack.size() == 0) {
-            openMainActivity(activity); // if no more page is on the stack this means we are home
-            return;
-        }
-        NavEntry entry = stack.pop();  // this element will reapear, since by calling the old page
-        // this element will be pushed on top again
-        try {
-            StreamingService service = NewPipe.getService(entry.serviceId);
-            switch (service.getLinkTypeByUrl(entry.url)) {
-                case STREAM:
-                    openDetailActivity(activity, entry.url, entry.serviceId);
-                    break;
-                case CHANNEL:
-                    openChannelActivity(activity, entry.url, entry.serviceId);
-                    break;
-                case NONE:
-                    throw new Exception("Url not known to service. service="
-                            + Integer.toString(entry.serviceId) + " url=" + entry.url);
-                default:
-                    openMainActivity(activity);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    public void openChannelActivity(Context context, String url, int serviceId) {
-        openActivity(context, url, serviceId, ChannelActivity.class);
-    }
-
-    public void openDetailActivity(Context context, String url, int serviceId) {
-        openActivity(context, url, serviceId, VideoItemDetailActivity.class);
-    }
-
-    private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
-        //if last element has the same url do not push to stack again
-        if(stack.isEmpty() || !stack.peek().url.equals(url)) {
-            stack.push(new NavEntry(url, serviceId));
-        }
-        Intent i = new Intent(context, acitivtyClass);
-        i.putExtra(SERVICE_ID, serviceId);
-        i.putExtra(URL, url);
-        context.startActivity(i);
-    }
-
-    public void openMainActivity(Activity a) {
-        stack.clear();
-        Intent i = new Intent(a, MainActivity.class);
-        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        NavUtils.navigateUpTo(a, i);
-    }
-
-    public void onSaveInstanceState(Bundle state) {
-        ArrayList<String> sa = new ArrayList<>();
-        for(NavEntry entry : stack) {
-            sa.add(entry.url);
-        }
-        state.putStringArrayList(NAV_STACK, sa);
-    }
-
-    public void restoreSavedInstanceState(Bundle state) {
-        ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
-        stack.clear();
-        for(String url : sa) {
-            stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
-        }
-    }
-}
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -0,0 +1,96 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.fragments.OnItemSelectedListener;
+import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
+
+@SuppressWarnings({"unused", "WeakerAccess"})
+public class NavigationHelper {
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through Interface (faster)
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url) {
+        openChannel(listener, serviceId, url, null);
+    }
+
+    public static void openChannel(OnItemSelectedListener listener, int serviceId, String url, String name) {
+        listener.onItemSelected(StreamingService.LinkType.CHANNEL, serviceId, url, name);
+    }
+
+    public static void openVideoDetail(OnItemSelectedListener listener, int serviceId, String url) {
+        openVideoDetail(listener, serviceId, url, null);
+    }
+
+    public static void openVideoDetail(OnItemSelectedListener listener, int serviceId, String url, String title) {
+        listener.onItemSelected(StreamingService.LinkType.STREAM, serviceId, url, title);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Through Intents
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public static void openByLink(Context context, String url) throws Exception {
+        context.startActivity(getIntentByLink(context, url));
+    }
+
+    public static void openChannel(Context context, int serviceId, String url) {
+        openChannel(context, serviceId, url, null);
+    }
+
+    public static void openChannel(Context context, int serviceId, String url, String name) {
+        Intent openIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.CHANNEL);
+        if (name != null && !name.isEmpty()) openIntent.putExtra(Constants.KEY_TITLE, name);
+        context.startActivity(openIntent);
+    }
+
+    public static void openVideoDetail(Context context, int serviceId, String url) {
+        openVideoDetail(context, serviceId, url, null);
+    }
+
+    public static void openVideoDetail(Context context, int serviceId, String url, String title) {
+        Intent openIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.STREAM);
+        if (title != null && !title.isEmpty()) openIntent.putExtra(Constants.KEY_TITLE, title);
+        context.startActivity(openIntent);
+    }
+
+    public static void openMainActivity(Context context) {
+        Intent mIntent = new Intent(context, MainActivity.class);
+        context.startActivity(mIntent);
+    }
+
+    private static Intent getOpenIntent(Context context, String url, int serviceId, StreamingService.LinkType type) {
+        Intent mIntent = new Intent(context, MainActivity.class);
+        mIntent.putExtra(Constants.KEY_SERVICE_ID, serviceId);
+        mIntent.putExtra(Constants.KEY_URL, url);
+        mIntent.putExtra(Constants.KEY_LINK_TYPE, type);
+        return mIntent;
+    }
+
+    private static Intent getIntentByLink(Context context, String url) throws Exception {
+        StreamingService service = NewPipe.getServiceByUrl(url);
+        if (service == null) throw new Exception("NewPipe.getServiceByUrl returned null for url > \"" + url + "\"");
+        int serviceId = service.getServiceId();
+        switch (service.getLinkTypeByUrl(url)) {
+            case STREAM:
+                Intent sIntent = getOpenIntent(context, url, serviceId, StreamingService.LinkType.STREAM);
+                sIntent.putExtra(VideoDetailFragment.AUTO_PLAY, PreferenceManager.getDefaultSharedPreferences(context)
+                        .getBoolean(context.getString(R.string.autoplay_through_intent_key), false));
+                return sIntent;
+            case CHANNEL:
+                return getOpenIntent(context, url, serviceId, StreamingService.LinkType.CHANNEL);
+            case NONE:
+                throw new Exception("Url not known to service. service="
+                        + Integer.toString(serviceId) + " url=" + url);
+        }
+        return null;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/util/Utils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Utils.java
@@ -0,0 +1,91 @@
+package org.schabi.newpipe.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+
+import java.util.List;
+
+public class Utils {
+
+    /**
+     * Return the index of the default stream in the list, based on the
+     * preferred resolution and format chosen in the settings
+     *
+     * @param videoStreams      the list that will be extracted the index
+     * @return index of the preferred resolution&format
+     */
+    public static int getPreferredResolution(Context context, List<VideoStream> videoStreams) {
+        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (defaultPreferences == null) return 0;
+
+        String defaultResolution = defaultPreferences
+                .getString(context.getString(R.string.default_resolution_key),
+                        context.getString(R.string.default_resolution_value));
+
+        String preferredFormat = defaultPreferences
+                .getString(context.getString(R.string.preferred_video_format_key),
+                        context.getString(R.string.preferred_video_format_default));
+
+        // first try to find the one with the right resolution
+        int selectedFormat = 0;
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)) {
+                selectedFormat = i;
+            }
+        }
+
+        // than try to find the one with the right resolution and format
+        for (int i = 0; i < videoStreams.size(); i++) {
+            VideoStream item = videoStreams.get(i);
+            if (defaultResolution.equals(item.resolution)
+                    && preferredFormat.equals(MediaFormat.getNameById(item.format))) {
+                selectedFormat = i;
+            }
+        }
+
+        // this is actually an error,
+        // but maybe there is really no stream fitting to the default value.
+        return selectedFormat;
+    }
+
+    /**
+     * Return the index of the default stream in the list, based on the
+     * preferred audio format chosen in the settings
+     *
+     * @param audioStreams      the list that will be extracted the index
+     * @return index of the preferred format
+     */
+    public static int getPreferredAudioFormat(Context context, List<AudioStream> audioStreams) {
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        if (sharedPreferences == null) return 0;
+
+        String preferredFormatString = sharedPreferences.getString(context.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 < audioStreams.size(); i++) {
+            if (audioStreams.get(i).format == preferredFormat) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/workers/ChannelExtractorWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/workers/ChannelExtractorWorker.java
@@ -0,0 +1,102 @@
+package org.schabi.newpipe.workers;
+
+import android.content.Context;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+
+/**
+ * Extract {@link ChannelInfo} with {@link ChannelExtractor} from the given url of the given service
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public class ChannelExtractorWorker extends ExtractorWorker {
+    //private static final String TAG = "ChannelExtractorWorker";
+
+    private int pageNumber;
+    private boolean onlyVideos;
+
+    private ChannelInfo channelInfo = null;
+    private OnChannelInfoReceive callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnChannelInfoReceive {
+        void onReceive(ChannelInfo info);
+        void onError(int messageId);
+    }
+
+    /**
+     * @param context           context for error reporting purposes
+     * @param serviceId         id of the request service
+     * @param channelUrl        channelUrl of the service (e.g. https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg)
+     * @param callback          listener that will be called-back when events occur (check {@link ChannelExtractorWorker.OnChannelInfoReceive})
+     */
+    public ChannelExtractorWorker(Context context, int serviceId, String channelUrl, int pageNumber, OnChannelInfoReceive callback) {
+        super(context, channelUrl, serviceId);
+        this.pageNumber = pageNumber;
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+        this.channelInfo = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId, String url) throws Exception {
+        ChannelExtractor extractor = getService().getChannelExtractorInstance(url, pageNumber);
+        channelInfo = ChannelInfo.getInfo(extractor);
+
+        if (!channelInfo.errors.isEmpty()) handleErrorsDuringExtraction(channelInfo.errors, ErrorActivity.REQUESTED_CHANNEL);
+
+        if (callback != null && channelInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onReceive(channelInfo);
+                onDestroy();
+            }
+        });
+    }
+
+
+    @Override
+    protected void handleException(Exception exception, int serviceId, String url) {
+        if (exception instanceof IOException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof ParsingException || exception instanceof ExtractionException) {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.parsing_error));
+            finishIfActivity();
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL, getServiceName(), url, R.string.general_error));
+            finishIfActivity();
+        }
+    }
+
+    public boolean isOnlyVideos() {
+        return onlyVideos;
+    }
+
+    public void setOnlyVideos(boolean onlyVideos) {
+        this.onlyVideos = onlyVideos;
+    }
+}
+
--- a/app/src/main/java/org/schabi/newpipe/workers/ExtractorWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/workers/ExtractorWorker.java
@@ -0,0 +1,168 @@
+package org.schabi.newpipe.workers;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.InterruptedIOException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Common properties of ExtractorWorkers
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public abstract class ExtractorWorker extends Thread {
+
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
+
+    private final String url;
+    private final int serviceId;
+    private Context context;
+    private Handler handler;
+    private StreamingService service;
+
+    public ExtractorWorker(Context context, String url, int serviceId) {
+        this.context = context;
+        this.url = url;
+        this.serviceId = serviceId;
+        this.handler = new Handler(context.getMainLooper());
+        if (url.length() >= 40) setName("Thread-" + url.substring(url.length() - 11, url.length()));
+    }
+
+    @Override
+    public void run() {
+        try {
+            isRunning.set(true);
+            service = NewPipe.getService(serviceId);
+            doWork(serviceId, url);
+        } catch (Exception e) {
+            // Handle the exception only if thread is not interrupted
+            if (!isInterrupted() && !(e instanceof InterruptedIOException) && !(e.getCause() instanceof InterruptedIOException)) {
+                handleException(e, serviceId, url);
+            }
+        } finally {
+            isRunning.set(false);
+        }
+    }
+
+    /**
+     * Here is the place that the heavy work is realized
+     *
+     * @param serviceId     serviceId that was passed when created this object
+     * @param url           url that was passed when created this object
+     *
+     * @throws Exception    these exceptions are handled by the {@link #handleException(Exception, int, String)}
+     */
+    protected abstract void doWork(int serviceId, String url) throws Exception;
+
+
+    /**
+     * Method that handle the exception thrown by the {@link #doWork(int, String)}.
+     *
+     * @param exception {@link Exception} that was thrown by {@link #doWork(int, String)}
+     */
+    protected abstract void handleException(Exception exception, int serviceId, String url);
+
+    /**
+     * Handle the errors <b>during</b> extraction and shows a Report button to the user.<br/>
+     * Subclasses <b>maybe</b> call this method.
+     *
+     * @param errorsList        list of exceptions that happened during extraction
+     * @param errorUserAction   what action was the user performing during the error.
+     *                          (One of the {@link ErrorActivity}.REQUEST_* error (message) ids)
+     */
+    protected void handleErrorsDuringExtraction(List<Throwable> errorsList, int errorUserAction){
+        String errorString = "<error id>";
+        switch (errorUserAction) {
+            case ErrorActivity.REQUESTED_STREAM:
+                errorString=  ErrorActivity.REQUESTED_STREAM_STRING;
+                break;
+            case ErrorActivity.REQUESTED_CHANNEL:
+                errorString=  ErrorActivity.REQUESTED_CHANNEL_STRING;
+                break;
+        }
+
+        Log.e(errorString, "OCCURRED ERRORS DURING EXTRACTION:");
+        for (Throwable e : errorsList) {
+            e.printStackTrace();
+            Log.e(errorString, "------");
+        }
+
+        if (getContext() instanceof Activity) {
+            View rootView = getContext() != null ? ((Activity) getContext()).findViewById(android.R.id.content) : null;
+            ErrorActivity.reportError(getHandler(), getContext(), errorsList, null, rootView, ErrorActivity.ErrorInfo.make(errorUserAction, getServiceName(), url, 0 /* no message for the user */));
+        }
+    }
+
+    /**
+     * Return true if the extraction is not completed yet
+     *
+     * @return the value of the AtomicBoolean {@link #isRunning}
+     */
+    public boolean isRunning() {
+        return isRunning.get();
+    }
+
+    /**
+     * Cancel this ExtractorWorker, calling {@link #onDestroy()} and interrupting this thread.
+     * <p>
+     * <b>Note:</b> Any I/O that is active in the moment that this method is called will be canceled and a Exception will be thrown, because of the {@link #interrupt()}.<br>
+     * This is useful when you don't want the resulting {@link StreamInfo} anymore, but don't want to waste bandwidth, otherwise it'd run till it receives the StreamInfo.
+     */
+    public void cancel() {
+        onDestroy();
+        this.interrupt();
+    }
+
+    /**
+     * Method that discards everything that doesn't need anymore.<br>
+     * Subclasses can override this method to destroy their garbage.
+     */
+    protected void onDestroy() {
+        this.isRunning.set(false);
+        this.context = null;
+        this.handler = null;
+        this.service = null;
+    }
+
+    /**
+     * If the context passed in the constructor is an {@link Activity}, finish it.
+     */
+    protected void finishIfActivity() {
+        if (getContext() instanceof Activity) ((Activity) getContext()).finish();
+    }
+
+    public Handler getHandler() {
+        return handler;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public StreamingService getService() {
+        return service;
+    }
+
+    public int getServiceId() {
+        return serviceId;
+    }
+
+    public String getServiceName() {
+        return service == null ? "none" : service.getServiceInfo().name;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/workers/StreamExtractorWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/workers/StreamExtractorWorker.java
@@ -0,0 +1,136 @@
+package org.schabi.newpipe.workers;
+
+import android.content.Context;
+
+import org.schabi.newpipe.MainActivity;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+
+/**
+ * Extract {@link StreamInfo} with {@link StreamExtractor} from the given url of the given service
+ *
+ * @author mauriciocolli
+ */
+@SuppressWarnings("WeakerAccess")
+public class StreamExtractorWorker extends ExtractorWorker {
+    //private static final String TAG = "StreamExtractorWorker";
+
+    private StreamInfo streamInfo = null;
+    private OnStreamInfoReceivedListener callback;
+
+    /**
+     * Interface which will be called for result and errors
+     */
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    /**
+     * @param context   context for error reporting purposes
+     * @param serviceId id of the request service
+     * @param videoUrl  videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param callback  listener that will be called-back when events occur (check {@link StreamExtractorWorker.OnStreamInfoReceivedListener})
+     */
+    public StreamExtractorWorker(Context context, int serviceId, String videoUrl, OnStreamInfoReceivedListener callback) {
+        super(context, videoUrl, serviceId);
+        this.callback = callback;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        this.callback = null;
+        this.streamInfo = null;
+    }
+
+    @Override
+    protected void doWork(int serviceId, String url) throws Exception {
+        StreamExtractor streamExtractor = getService().getExtractorInstance(url);
+        streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+        if (streamInfo != null && !streamInfo.errors.isEmpty()) handleErrorsDuringExtraction(streamInfo.errors, ErrorActivity.REQUESTED_STREAM);
+
+        if (callback != null && streamInfo != null && !isInterrupted()) getHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                if (isInterrupted() || callback == null) return;
+
+                callback.onReceive(streamInfo);
+                onDestroy();
+            }
+        });
+
+    }
+
+    @Override
+    protected void handleException(final Exception exception, int serviceId, String url) {
+        if (exception instanceof ReCaptchaException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaException();
+                }
+            });
+        } else if (exception instanceof IOException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onBlockedByGemaError();
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.LiveStreamException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
+                }
+            });
+        } else if (exception instanceof StreamExtractor.ContentNotAvailableException) {
+            if (callback != null) getHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentError();
+                }
+            });
+        } else if (exception instanceof YoutubeStreamExtractor.DecryptException) {
+            // custom service related exceptions
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.youtube_signature_decryption_error));
+            finishIfActivity();
+        } else if (exception instanceof StreamInfo.StreamExctractException) {
+            if (!streamInfo.errors.isEmpty()) {
+                // !!! if this case ever kicks in someone gets kicked out !!!
+                ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            } else {
+                ErrorActivity.reportError(getHandler(), getContext(), streamInfo.errors, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.could_not_get_stream));
+            }
+            finishIfActivity();
+        } else if (exception instanceof ParsingException) {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.parsing_error));
+            finishIfActivity();
+        } else {
+            ErrorActivity.reportError(getHandler(), getContext(), exception, MainActivity.class, null, ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM, getServiceName(), url, R.string.general_error));
+            finishIfActivity();
+        }
+
+    }
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christian Schabesberger	e5bf98a741	move on to version 0.9.2	2017-04-11 22:51:04 +02:00
Christian Schabesberger	06fafc247e	move to version 0.9.2 of NewPipeExtractor	2017-04-11 22:49:18 +02:00
Christian Schabesberger	e8bb17b631	Merge branch 'fix-next-video' of git://github.com/mauriciocolli/NewPipe into mul	2017-04-11 22:26:41 +02:00
Freddy Morán Jr	363cd07883	Translated using Weblate (Spanish) Currently translated at 100.0% (160 of 160 strings)	2017-04-11 18:56:03 +02:00
Mladen Pejaković	2b4a9286c4	Translated using Weblate (Serbian) Currently translated at 99.3% (159 of 160 strings)	2017-04-11 00:46:21 +02:00
Nathan Follens	34c985026f	Translated using Weblate (Dutch) Currently translated at 100.0% (160 of 160 strings)	2017-04-10 17:40:52 +02:00
naofum	4a0aa42914	Translated using Weblate (Japanese) Currently translated at 100.0% (160 of 160 strings)	2017-04-10 17:21:54 +02:00
Mauricio Colli	746c2a15bf	Migrate to fragments and improvements - Migrate to fragments - Fix #487 - Don't show "Open in popup mode" to channel links - New backstack of videos - Change the subscribers count to format using `NumberFormat`, for example some locales use `.` others `,`, this handles it automatically (and the old method had a bug for leading zero, e.g. 4.82.125 instead of 4.082.125) - Add string 'subscribers' for channels with more than 1 subscriber (plural) - Popup player chooses the default format and resolution based on the new preference (format) - Fix taskaffinity of the router activities - Show title before loading, as it is available from the items already loaded	2017-04-09 14:34:00 -03:00
zmni	9318bb5306	Translated using Weblate (Indonesian) Currently translated at 100.0% (160 of 160 strings)	2017-04-09 07:39:53 +02:00
Matej U	2a10ceb74f	Translated using Weblate (Slovenian) Currently translated at 100.0% (160 of 160 strings)	2017-04-08 22:08:31 +02:00
Weblate	83f4db59e2	Merge remote-tracking branch 'origin/master'	2017-04-08 21:47:50 +02:00
Olexandr Nesterenko	9f66f759ad	Translated using Weblate (Ukrainian) Currently translated at 84.9% (135 of 159 strings)	2017-04-08 21:47:47 +02:00
Christian Schabesberger	6f015349e8	moved on to v0.9.1	2017-04-08 17:17:58 +02:00
Christian Schabesberger	a37802c2b9	add prefered video format	2017-04-08 17:17:11 +02:00
Florian	4fa3baf5e1	Translated using Weblate (French) Currently translated at 99.3% (158 of 159 strings)	2017-04-07 12:45:03 +02:00
Oscar Hemelaar	ef8c2c81d5	Translated using Weblate (Italian) Currently translated at 98.7% (157 of 159 strings)	2017-04-07 03:45:31 +02:00
Mladen Pejaković	8c80d8c457	Translated using Weblate (Serbian) Currently translated at 99.3% (158 of 159 strings)	2017-04-07 00:46:25 +02:00
Matej U	1596872c54	Translated using Weblate (Slovenian) Currently translated at 100.0% (159 of 159 strings)	2017-04-05 14:47:22 +02:00
Oscar Hemelaar	da8873fa78	Translated using Weblate (French) Currently translated at 99.3% (158 of 159 strings)	2017-04-05 12:14:32 +02:00
Oscar Hemelaar	ecd8439b3f	Translated using Weblate (French) Currently translated at 98.1% (156 of 159 strings) if it's for a video restart button, it's "Relancer"	2017-04-05 02:53:08 +02:00
Oscar Hemelaar	5d178532ac	Translated using Weblate (French) Currently translated at 97.4% (155 of 159 strings)	2017-04-05 02:52:24 +02:00
Oscar Hemelaar	08e40a013d	Translated using Weblate (French) Currently translated at 96.8% (154 of 159 strings) or "OK" ?	2017-04-05 02:50:49 +02:00
Oscar Hemelaar	c136f7363c	Translated using Weblate (French) Currently translated at 96.2% (153 of 159 strings)	2017-04-05 02:50:26 +02:00
Florian	a60f10d739	Translated using Weblate (French) Currently translated at 90.5% (144 of 159 strings)	2017-04-04 21:45:44 +02:00
naofum	ae46afcb42	Translated using Weblate (Japanese) Currently translated at 100.0% (159 of 159 strings)	2017-04-04 16:15:27 +02:00
mueller-ma	bffb9f6800	Translated using Weblate (German) Currently translated at 95.5% (152 of 159 strings)	2017-04-03 09:29:35 +02:00
Tobias Groza	79aa9ad04b	Translated using Weblate (German) Currently translated at 94.9% (151 of 159 strings)	2017-04-03 09:26:41 +02:00
anonymous	ff5714f04a	Translated using Weblate (French) Currently translated at 89.9% (143 of 159 strings)	2017-04-02 18:59:25 +02:00
zmni	ce499a9766	Translated using Weblate (Indonesian) Currently translated at 100.0% (159 of 159 strings)	2017-04-02 16:49:33 +02:00
Weblate	d3bb8b7651	Merge remote-tracking branch 'origin/master'	2017-04-02 16:48:37 +02:00
Freddy Morán Jr	6d9c23c4cb	Translated using Weblate (Spanish) Currently translated at 100.0% (158 of 158 strings)	2017-04-02 16:48:36 +02:00
Nathan Follens	b95a9332a9	Translated using Weblate (Dutch) Currently translated at 100.0% (158 of 158 strings)	2017-04-02 16:48:35 +02:00
zmni	609715eb5c	Translated using Weblate (Indonesian) Currently translated at 100.0% (158 of 158 strings)	2017-04-02 16:48:33 +02:00