Merge branch 'dev' into patch-1

.github/CONTRIBUTING.md

@@ -5,44 +5,64 @@ PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!
 
 ## Crash reporting
 
-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
+send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
 
 ## Issue reporting/feature requests
 
-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
+hasn't been reported/requested before
 * Check whether your issue/feature is already fixed/implemented
 * Check if the issue still exists in the latest release/beta version
 * If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
 * We use English for development. Issues in other languages will be closed and ignored.
 * Please only add *one* issue at a time. Do not put multiple issues into one thread.
 * When reporting a bug please give us a context, and a description how to reproduce it.
-* Issues that only contain a generated bug report, but no describtion might be closed.
+* Issues that only contain a generated bug report, but no description might be closed.
 
 ## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
+* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
+tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request,
+register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
 
 ## Translation
 
-* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there with your GitHub account.
+* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
+with your GitHub account.
 
 ## Code contribution
 
 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
+* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+  libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You
-* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+  may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+  not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* When submitting changes, you confirm that your code is licensed under the terms of the
+  [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+  description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about submission, or clearly state that in the description of your PR.
+  but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the
+  maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
+  the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
+  about submission, or clearly state that in the description of your PR.
 * Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
 * Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
 * Check if your submission can be build with the current fdroid build server setup.
+* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+  independent solutions.
 
 ## Communication
 
 * WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
-* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+  [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to
+  tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
+  tracker described above!
 * Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!

README.md

@@ -12,7 +12,7 @@
 <a href="https://www.bountysource.com/teams/newpipe" alt="Bountysource bounties"><img src="https://img.shields.io/bountysource/team/newpipe/activity.svg?colorB=cd201f"></a>
 </p>
 <hr>
-<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
+<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#updates">Updates</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
 <hr>
 
@@ -73,6 +73,20 @@ NewPipe does not use any Google framework libraries, nor the YouTube API. Websit
 * Show comments
 * … and many more
 
+## Updates
+When a change to the NewPipe code occurs (due to either adding features or bug fixing), eventually a release will occur. These are in the format x.xx.x . In order to get this new version, you can:
+ * Build a debug APK yourself. This is the fastest way to get new features on your device, but is much more complicated, so we recommend using one of the other methods.
+ * Download the APK from [releases](https://github.com/TeamNewPipe/NewPipe/releases) and install it.
+ * Update via F-droid. This is the slowest method of getting updates, as F-Droid must recognize changes, build the APK itself, sign it, then push the update to users.
+
+When you install an APK from one of these options, it will be incompatible with an APK from one of the other options. This is due to different signing keys being used. Signing keys help ensure that a user isn't tricked into installing a malicious update to an app, and are independent. F-Droid and GitHub use different signing keys, and building an APK debug excludes a key. The signing key issue is being discussed in issue [#1981](https://github.com/TeamNewPipe/NewPipe/issues/1981), and may be fixed by setting up our own repository on F-Droid.
+
+In the meanwhile, if you want to switch sources for some reason (e.g. NewPipe's core functionality was broken and F-Droid doesn't have the update yet), we recommend following this procedure:
+1. Back up your data via "Settings>Content>Export Database" so you keep your history, subscriptions, and playlists
+2. Uninstall NewPipe
+3. Download the APK from the new source and install it
+4. Import the data from step 1 via "Settings>Content>Import Database"
+
 ## Contribution
 Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!

app/build.gradle

@@ -6,20 +6,22 @@ android {
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
-        minSdkVersion 15
+        minSdkVersion 19
         targetSdkVersion 28
-        versionCode 69
+        versionCode 71
-        versionName "0.14.2"
+        versionName "0.15.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
         debug {
             multiDexEnabled true
             debuggable true
@@ -33,6 +35,7 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -54,7 +57,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:32d316330c26'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:f7c7b9df1a'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'

app/src/main/AndroidManifest.xml

@@ -119,7 +119,6 @@
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity"/>
-        <activity android:name=".download.ExtSDDownloadFailedActivity" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.annotation.TargetApi;
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -65,6 +66,7 @@ import io.reactivex.plugins.RxJavaPlugins;
 public class App extends Application {
     protected static final String TAG = App.class.toString();
     private RefWatcher refWatcher;
+    private static App app;
 
     @SuppressWarnings("unchecked")
     private static final Class<? extends ReportSenderFactory>[]
@@ -88,6 +90,8 @@ public class App extends Application {
         }
         refWatcher = installLeakCanary();
 
+        app = this;
+
         // Initialize settings first because others inits can use its values
         SettingsActivity.initSettings(this);
 
@@ -100,6 +104,9 @@ public class App extends Application {
         ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
 
         configureRxJavaErrorHandler();
+
+        // Check for new version
+        new CheckForNewAppVersionTask().execute();
     }
 
     protected Downloader getDownloader() {
@@ -211,6 +218,31 @@ public class App extends Application {
         NotificationManager mNotificationManager =
                 (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(mChannel);
+
+        setUpUpdateNotificationChannel(importance);
+    }
+
+    /**
+     * Set up notification channel for app update.
+     * @param importance
+     */
+    @TargetApi(Build.VERSION_CODES.O)
+    private void setUpUpdateNotificationChannel(int importance) {
+
+        final String appUpdateId
+                = getString(R.string.app_update_notification_channel_id);
+        final CharSequence appUpdateName
+                = getString(R.string.app_update_notification_channel_name);
+        final String appUpdateDescription
+                = getString(R.string.app_update_notification_channel_description);
+
+        NotificationChannel appUpdateChannel
+                = new NotificationChannel(appUpdateId, appUpdateName, importance);
+        appUpdateChannel.setDescription(appUpdateDescription);
+
+        NotificationManager appUpdateNotificationManager
+                = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        appUpdateNotificationManager.createNotificationChannel(appUpdateChannel);
     }
 
     @Nullable
@@ -226,4 +258,8 @@ public class App extends Application {
     protected boolean isDisposedRxExceptionsReported() {
         return false;
     }
+
+    public static App getApp() {
+        return app;
+    }
 }

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

@@ -0,0 +1,230 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.NotificationManagerCompat;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+/**
+ * AsyncTask to check if there is a newer version of the NewPipe github apk available or not.
+ * If there is a newer version we show a notification, informing the user. On tapping
+ * the notification, the user will be directed to the download link.
+ */
+public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
+
+    private static final Application app = App.getApp();
+    private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
+    private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
+    private static final int timeoutPeriod = 30;
+
+    private SharedPreferences mPrefs;
+    private OkHttpClient client;
+
+    @Override
+    protected void onPreExecute() {
+
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(app);
+
+        // Check if user has enabled/ disabled update checking
+        // and if the current apk is a github one or not.
+        if (!mPrefs.getBoolean(app.getString(R.string.update_app_key), true)
+                || !isGithubApk()) {
+            this.cancel(true);
+        }
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+
+        // Make a network request to get latest NewPipe data.
+        if (client == null) {
+
+            client = new OkHttpClient
+                    .Builder()
+                    .readTimeout(timeoutPeriod, TimeUnit.SECONDS)
+                    .build();
+        }
+
+        Request request = new Request.Builder()
+                .url(newPipeApiUrl)
+                .build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            return response.body().string();
+        } catch (IOException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "app update API fail", R.string.app_ui_crash));
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(String response) {
+
+        // Parse the json from the response.
+        if (response != null) {
+
+            try {
+                JSONObject mainObject = new JSONObject(response);
+                JSONObject flavoursObject = mainObject.getJSONObject("flavors");
+                JSONObject githubObject = flavoursObject.getJSONObject("github");
+                JSONObject githubStableObject = githubObject.getJSONObject("stable");
+
+                String versionName = githubStableObject.getString("version");
+                String versionCode = githubStableObject.getString("version_code");
+                String apkLocationUrl = githubStableObject.getString("apk");
+
+                compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
+
+            } catch (JSONException ex) {
+                ErrorActivity.reportError(app, ex, null, null,
+                        ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                        "could not parse app update JSON data", R.string.app_ui_crash));
+            }
+        }
+    }
+
+    /**
+     * Method to compare the current and latest available app version.
+     * If a newer version is available, we show the update notification.
+     * @param versionName
+     * @param apkLocationUrl
+     */
+    private void compareAppVersionAndShowNotification(String versionName,
+                                                      String apkLocationUrl,
+                                                      String versionCode) {
+
+        int NOTIFICATION_ID = 2000;
+
+        if (BuildConfig.VERSION_CODE < Integer.valueOf(versionCode)) {
+
+            // A pending intent to open the apk location url in the browser.
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(apkLocationUrl));
+            PendingIntent pendingIntent
+                    = PendingIntent.getActivity(app, 0, intent, 0);
+
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat
+                    .Builder(app, app.getString(R.string.app_update_notification_channel_id))
+                    .setSmallIcon(R.drawable.ic_newpipe_update)
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setContentIntent(pendingIntent)
+                    .setAutoCancel(true)
+                    .setContentTitle(app.getString(R.string.app_update_notification_content_title))
+                    .setContentText(app.getString(R.string.app_update_notification_content_text)
+                            + " " + versionName);
+
+            NotificationManagerCompat notificationManager = NotificationManagerCompat.from(app);
+            notificationManager.notify(NOTIFICATION_ID, notificationBuilder.build());
+        }
+    }
+
+    /**
+     * Method to get the apk's SHA1 key.
+     * https://stackoverflow.com/questions/9293019/get-certificate-fingerprint-from-android-app#22506133
+     */
+    private static String getCertificateSHA1Fingerprint() {
+
+        PackageManager pm = app.getPackageManager();
+        String packageName = app.getPackageName();
+        int flags = PackageManager.GET_SIGNATURES;
+        PackageInfo packageInfo = null;
+
+        try {
+            packageInfo = pm.getPackageInfo(packageName, flags);
+        } catch (PackageManager.NameNotFoundException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not find package info", R.string.app_ui_crash));
+        }
+
+        Signature[] signatures = packageInfo.signatures;
+        byte[] cert = signatures[0].toByteArray();
+        InputStream input = new ByteArrayInputStream(cert);
+
+        CertificateFactory cf = null;
+        X509Certificate c = null;
+
+        try {
+            cf = CertificateFactory.getInstance("X509");
+            c = (X509Certificate) cf.generateCertificate(input);
+        } catch (CertificateException ex) {
+            ErrorActivity.reportError(app, ex, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Certificate error", R.string.app_ui_crash));
+        }
+
+        String hexString = null;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(c.getEncoded());
+            hexString = byte2HexFormatted(publicKey);
+        } catch (NoSuchAlgorithmException ex1) {
+            ErrorActivity.reportError(app, ex1, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        } catch (CertificateEncodingException ex2) {
+            ErrorActivity.reportError(app, ex2, null, null,
+                    ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+                            "Could not retrieve SHA1 key", R.string.app_ui_crash));
+        }
+
+        return hexString;
+    }
+
+    private static String byte2HexFormatted(byte[] arr) {
+
+        StringBuilder str = new StringBuilder(arr.length * 2);
+
+        for (int i = 0; i < arr.length; i++) {
+            String h = Integer.toHexString(arr[i]);
+            int l = h.length();
+            if (l == 1) h = "0" + h;
+            if (l > 2) h = h.substring(l - 2, l);
+            str.append(h.toUpperCase());
+            if (i < (arr.length - 1)) str.append(':');
+        }
+        return str.toString();
+    }
+
+    public static boolean isGithubApk() {
+
+        return getCertificateSHA1Fingerprint().equals(GITHUB_APK_SHA1);
+    }
+}

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

@@ -89,7 +89,8 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
                     .build();
             response = client.newCall(request).execute();
 
-            return Long.parseLong(response.header("Content-Length"));
+            String contentLength = response.header("Content-Length");
+            return contentLength == null ? -1 : Long.parseLong(contentLength);
         } catch (NumberFormatException e) {
             throw new IOException("Invalid content length", e);
         } finally {

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

@@ -542,8 +542,7 @@ public class RouterActivity extends AppCompatActivity {
 
                 final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
                 boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
-                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
+                boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);;
-                boolean useOldVideoPlayer = PlayerHelper.isUsingOldPlayer(this);
 
                 PlayQueue playQueue;
                 String playerChoice = choice.playerChoice;
@@ -555,9 +554,6 @@ public class RouterActivity extends AppCompatActivity {
                     } else if (playerChoice.equals(videoPlayerKey) && isExtVideoEnabled) {
                         NavigationHelper.playOnExternalVideoPlayer(this, (StreamInfo) info);
 
-                    } else if (playerChoice.equals(videoPlayerKey) && useOldVideoPlayer) {
-                        NavigationHelper.playOnOldVideoPlayer(this, (StreamInfo) info);
-
                     } else {
                         playQueue = new SinglePlayQueue((StreamInfo) info);
 

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

@@ -1,158 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.get.DownloadMission;
-
-public class DeleteDownloadManager {
-
-    private static final String KEY_STATE = "delete_manager_state";
-
-    private final View mView;
-    private final HashSet<String> mPendingMap;
-    private final List<Disposable> mDisposableList;
-    private DownloadManager mDownloadManager;
-    private final PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
-
-    DeleteDownloadManager(Activity activity) {
-        mPendingMap = new HashSet<>();
-        mDisposableList = new ArrayList<>();
-        mView = activity.findViewById(android.R.id.content);
-    }
-
-    public Observable<DownloadMission> getUndoObservable() {
-        return publishSubject;
-    }
-
-    public boolean contains(@NonNull DownloadMission mission) {
-        return mPendingMap.contains(mission.url);
-    }
-
-    public void add(@NonNull DownloadMission mission) {
-        mPendingMap.add(mission.url);
-
-        if (mPendingMap.size() == 1) {
-            showUndoDeleteSnackbar(mission);
-        }
-    }
-
-    public void setDownloadManager(@NonNull DownloadManager downloadManager) {
-        mDownloadManager = downloadManager;
-
-        if (mPendingMap.size() < 1) return;
-
-        showUndoDeleteSnackbar();
-    }
-
-    public void restoreState(@Nullable Bundle savedInstanceState) {
-        if (savedInstanceState == null) return;
-
-        List<String> list = savedInstanceState.getStringArrayList(KEY_STATE);
-        if (list != null) {
-            mPendingMap.addAll(list);
-        }
-    }
-
-    public void saveState(@Nullable Bundle outState) {
-        if (outState == null) return;
-
-        for (Disposable disposable : mDisposableList) {
-            disposable.dispose();
-        }
-
-        outState.putStringArrayList(KEY_STATE, new ArrayList<>(mPendingMap));
-    }
-
-    private void showUndoDeleteSnackbar() {
-        if (mPendingMap.size() < 1) return;
-
-        String url = mPendingMap.iterator().next();
-
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            DownloadMission mission = mDownloadManager.getMission(i);
-            if (url.equals(mission.url)) {
-                showUndoDeleteSnackbar(mission);
-                break;
-            }
-        }
-    }
-
-    private void showUndoDeleteSnackbar(@NonNull DownloadMission mission) {
-        final Snackbar snackbar = Snackbar.make(mView, mission.name, Snackbar.LENGTH_INDEFINITE);
-        final Disposable disposable = Observable.timer(3, TimeUnit.SECONDS)
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .subscribe(l -> snackbar.dismiss());
-
-        mDisposableList.add(disposable);
-
-        snackbar.setAction(R.string.undo, v -> {
-            mPendingMap.remove(mission.url);
-            publishSubject.onNext(mission);
-            disposable.dispose();
-            snackbar.dismiss();
-        });
-
-        snackbar.addCallback(new BaseTransientBottomBar.BaseCallback<Snackbar>() {
-            @Override
-            public void onDismissed(Snackbar transientBottomBar, int event) {
-                if (!disposable.isDisposed()) {
-                    Completable.fromAction(() -> deletePending(mission))
-                            .subscribeOn(Schedulers.io())
-                            .subscribe();
-                }
-                mPendingMap.remove(mission.url);
-                snackbar.removeCallback(this);
-                mDisposableList.remove(disposable);
-                showUndoDeleteSnackbar();
-            }
-        });
-
-        snackbar.show();
-    }
-
-    public void deletePending() {
-        if (mPendingMap.size() < 1) return;
-
-        HashSet<Integer> idSet = new HashSet<>();
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (contains(mDownloadManager.getMission(i))) {
-                idSet.add(i);
-            }
-        }
-
-        for (Integer id : idSet) {
-            mDownloadManager.deleteMission(id);
-        }
-
-        mPendingMap.clear();
-    }
-
-    private void deletePending(@NonNull DownloadMission mission) {
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
-            if (mission.url.equals(mDownloadManager.getMission(i).url)) {
-                mDownloadManager.deleteMission(i);
-                break;
-            }
-        }
-    }
-}

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

@@ -15,16 +15,12 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import io.reactivex.Completable;
-import io.reactivex.schedulers.Schedulers;
 import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
 import us.shandian.giga.ui.fragment.MissionsFragment;
 
 public class DownloadActivity extends AppCompatActivity {
 
     private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
-    private DeleteDownloadManager mDeleteDownloadManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,32 +43,17 @@ public class DownloadActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        mDeleteDownloadManager = new DeleteDownloadManager(this);
+        getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-        mDeleteDownloadManager.restoreState(savedInstanceState);
+            @Override
-
+            public void onGlobalLayout() {
-        MissionsFragment fragment = (MissionsFragment) getFragmentManager().findFragmentByTag(MISSIONS_FRAGMENT_TAG);
+                updateFragments();
-        if (fragment != null) {
+                getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
-            fragment.setDeleteManager(mDeleteDownloadManager);
+            }
-        } else {
+        });
-            getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    updateFragments();
-                    getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        mDeleteDownloadManager.saveState(outState);
-        super.onSaveInstanceState(outState);
     }
 
     private void updateFragments() {
-        MissionsFragment fragment = new AllMissionsFragment();
+        MissionsFragment fragment = new MissionsFragment();
-        fragment.setDeleteManager(mDeleteDownloadManager);
 
         getFragmentManager().beginTransaction()
                 .replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
@@ -99,7 +80,6 @@ public class DownloadActivity extends AppCompatActivity {
             case R.id.action_settings: {
                 Intent intent = new Intent(this, SettingsActivity.class);
                 startActivity(intent);
-                deletePending();
                 return true;
             }
             default:
@@ -108,14 +88,7 @@ public class DownloadActivity extends AppCompatActivity {
     }
 
     @Override
-    public void onBackPressed() {
+    public void onRestoreInstanceState(Bundle inState){
-        super.onBackPressed();
+        super.onRestoreInstanceState(inState);
-        deletePending();
-    }
-
-    private void deletePending() {
-        Completable.fromAction(mDeleteDownloadManager::deletePending)
-                .subscribeOn(Schedulers.io())
-                .subscribe();
     }
 }

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

@@ -1,13 +1,17 @@
 package org.schabi.newpipe.download;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,38 +26,55 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.FilenameUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.SecondaryStreamHelper;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import icepick.Icepick;
 import icepick.State;
 import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManagerService;
 
 public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
     private static final boolean DEBUG = MainActivity.DEBUG;
 
-    @State protected StreamInfo currentInfo;
+    @State
-    @State protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
+    protected StreamInfo currentInfo;
-    @State protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    @State
-    @State protected int selectedVideoIndex = 0;
+    protected StreamSizeWrapper<AudioStream> wrappedAudioStreams = StreamSizeWrapper.empty();
-    @State protected int selectedAudioIndex = 0;
+    @State
+    protected StreamSizeWrapper<VideoStream> wrappedVideoStreams = StreamSizeWrapper.empty();
+    @State
+    protected StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams = StreamSizeWrapper.empty();
+    @State
+    protected int selectedVideoIndex = 0;
+    @State
+    protected int selectedAudioIndex = 0;
+    @State
+    protected int selectedSubtitleIndex = 0;
 
-    private StreamItemAdapter<AudioStream> audioStreamsAdapter;
+    private StreamItemAdapter<AudioStream, Stream> audioStreamsAdapter;
-    private StreamItemAdapter<VideoStream> videoStreamsAdapter;
+    private StreamItemAdapter<VideoStream, AudioStream> videoStreamsAdapter;
+    private StreamItemAdapter<SubtitlesStream, Stream> subtitleStreamsAdapter;
 
     private final CompositeDisposable disposables = new CompositeDisposable();
 
@@ -63,6 +84,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private TextView threadsCountTextView;
     private SeekBar threadsSeekBar;
 
+    private SharedPreferences prefs;
+
     public static DownloadDialog newInstance(StreamInfo info) {
         DownloadDialog dialog = new DownloadDialog();
         dialog.setInfo(info);
@@ -78,6 +101,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         instance.setVideoStreams(streamsList);
         instance.setSelectedVideoStream(selectedStreamIndex);
         instance.setAudioStreams(info.getAudioStreams());
+        instance.setSubtitleStreams(info.getSubtitles());
+
         return instance;
     }
 
@@ -86,7 +111,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     public void setAudioStreams(List<AudioStream> audioStreams) {
-        setAudioStreams(new StreamSizeWrapper<>(audioStreams));
+        setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
     }
 
     public void setAudioStreams(StreamSizeWrapper<AudioStream> wrappedAudioStreams) {
@@ -94,13 +119,21 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     }
 
     public void setVideoStreams(List<VideoStream> videoStreams) {
-        setVideoStreams(new StreamSizeWrapper<>(videoStreams));
+        setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
     }
 
     public void setVideoStreams(StreamSizeWrapper<VideoStream> wrappedVideoStreams) {
         this.wrappedVideoStreams = wrappedVideoStreams;
     }
 
+    public void setSubtitleStreams(List<SubtitlesStream> subtitleStreams) {
+        setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
+    }
+
+    public void setSubtitleStreams(StreamSizeWrapper<SubtitlesStream> wrappedSubtitleStreams) {
+        this.wrappedSubtitleStreams = wrappedSubtitleStreams;
+    }
+
     public void setSelectedVideoStream(int selectedVideoIndex) {
         this.selectedVideoIndex = selectedVideoIndex;
     }
@@ -109,6 +142,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         this.selectedAudioIndex = selectedAudioIndex;
     }
 
+    public void setSelectedSubtitleStream(int selectedSubtitleIndex) {
+        this.selectedSubtitleIndex = selectedSubtitleIndex;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
@@ -116,7 +153,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
         if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
             getDialog().dismiss();
             return;
@@ -125,13 +163,29 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
         Icepick.restoreInstanceState(this, savedInstanceState);
 
-        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, true);
+        SparseArray<SecondaryStreamHelper<AudioStream>> secondaryStreams = new SparseArray<>(4);
+        List<VideoStream> videoStreams = wrappedVideoStreams.getStreamsList();
+
+        for (int i = 0; i < videoStreams.size(); i++) {
+            if (!videoStreams.get(i).isVideoOnly()) continue;
+            AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
+
+            if (audioStream != null) {
+                secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+            } else if (DEBUG) {
+                Log.w(TAG, "No audio stream candidates for video format " + videoStreams.get(i).getFormat().name());
+            }
+        }
+
+        this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, secondaryStreams);
         this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
+        this.subtitleStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedSubtitleStreams);
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
         return inflater.inflate(R.layout.download_dialog, container);
     }
 
@@ -142,6 +196,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
         selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
 
+        selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
+
         streamsSpinner = view.findViewById(R.id.quality_spinner);
         streamsSpinner.setOnItemSelectedListener(this);
 
@@ -154,14 +210,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         initToolbar(view.findViewById(R.id.toolbar));
         setupDownloadOptions();
 
-        int def = 3;
+        prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-        threadsCountTextView.setText(String.valueOf(def));
+
-        threadsSeekBar.setProgress(def - 1);
+        int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
+        threadsCountTextView.setText(String.valueOf(threads));
+        threadsSeekBar.setProgress(threads - 1);
         threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
 
             @Override
             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
-                threadsCountTextView.setText(String.valueOf(progress + 1));
+                progress++;
+                prefs.edit().putInt(getString(R.string.default_download_threads), progress).apply();
+                threadsCountTextView.setText(String.valueOf(progress));
             }
 
             @Override
@@ -189,6 +249,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
                 setupAudioSpinner();
             }
         }));
+        disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
+            if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+                setupSubtitleSpinner();
+            }
+        }));
     }
 
     @Override
@@ -216,7 +281,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
         toolbar.setOnMenuItemClickListener(item -> {
             if (item.getItemId() == R.id.okay) {
-                downloadSelected();
+                prepareSelectedDownload();
                 return true;
             }
             return false;
@@ -239,13 +304,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         setRadioButtonsState(true);
     }
 
+    private void setupSubtitleSpinner() {
+        if (getContext() == null) return;
+
+        streamsSpinner.setAdapter(subtitleStreamsAdapter);
+        streamsSpinner.setSelection(selectedSubtitleIndex);
+        setRadioButtonsState(true);
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Radio group Video&Audio options - Listener
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
     public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
-        if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+        boolean flag = true;
+
         switch (checkedId) {
             case R.id.audio_button:
                 setupAudioSpinner();
@@ -253,7 +329,13 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             case R.id.video_button:
                 setupVideoSpinner();
                 break;
+            case R.id.subtitle_button:
+                setupSubtitleSpinner();
+                flag = false;
+                break;
         }
+
+        threadsSeekBar.setEnabled(flag);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -262,7 +344,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+        if (DEBUG)
+            Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
         switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 selectedAudioIndex = position;
@@ -270,6 +353,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
             case R.id.video_button:
                 selectedVideoIndex = position;
                 break;
+            case R.id.subtitle_button:
+                selectedSubtitleIndex = position;
+                break;
         }
     }
 
@@ -286,11 +372,14 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
 
         final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
         final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+        final RadioButton subtitleButton = radioVideoAudioGroup.findViewById(R.id.subtitle_button);
         final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
         final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+        final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
 
         audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
         videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+        subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);
 
         if (isVideoStreamsAvailable) {
             videoButton.setChecked(true);
@@ -298,6 +387,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
         } else if (isAudioStreamsAvailable) {
             audioButton.setChecked(true);
             setupAudioSpinner();
+        } else if (isSubtitleStreamsAvailable) {
+            subtitleButton.setChecked(true);
+            setupSubtitleSpinner();
         } else {
             Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
             getDialog().dismiss();
@@ -307,28 +399,143 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private void setRadioButtonsState(boolean enabled) {
         radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
         radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
+        radioVideoAudioGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
     }
 
-    private void downloadSelected() {
+    private int getSubtitleIndexBy(List<SubtitlesStream> streams) {
-        Stream stream;
+        Localization loc = NewPipe.getPreferredLocalization();
-        String location;
 
-        String fileName = nameEditText.getText().toString().trim();
+        for (int i = 0; i < streams.size(); i++) {
-        if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
+            Locale streamLocale = streams.get(i).getLocale();
-
+            String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
-        boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
+            if (tag.equalsIgnoreCase(loc.getLanguage())) {
-        if (isAudio) {
+                return i;
-            stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+            }
-            location = NewPipeSettings.getAudioDownloadPath(getContext());
-        } else {
-            stream = videoStreamsAdapter.getItem(selectedVideoIndex);
-            location = NewPipeSettings.getVideoDownloadPath(getContext());
         }
 
-        String url = stream.getUrl();
+        // fallback
-        fileName += "." + stream.getFormat().getSuffix();
+        // 1st loop match country & language
+        // 2nd loop match language only
+        int index = loc.getLanguage().indexOf("-");
+        String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();
+
+        for (int j = 0; j < 2; j++) {
+            for (int i = 0; i < streams.size(); i++) {
+                Locale streamLocale = streams.get(i).getLocale();
+
+                if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
+                    if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
+                        return i;
+                    }
+                }
+            }
+        }
+
+        return 0;
+    }
+
+    private void prepareSelectedDownload() {
+        final Context context = getContext();
+        Stream stream;
+        String location;
+        char kind;
+
+        String fileName = nameEditText.getText().toString().trim();
+        if (fileName.isEmpty())
+            fileName = FilenameUtils.createFilename(context, currentInfo.getName());
+
+        switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+            case R.id.audio_button:
+                stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+                location = NewPipeSettings.getAudioDownloadPath(context);
+                kind = 'a';
+                break;
+            case R.id.video_button:
+                stream = videoStreamsAdapter.getItem(selectedVideoIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);
+                kind = 'v';
+                break;
+            case R.id.subtitle_button:
+                stream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+                location = NewPipeSettings.getVideoDownloadPath(context);// assume that subtitle & video files go together
+                kind = 's';
+                break;
+            default:
+                return;
+        }
+
+        int threads;
+
+        if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+            threads = 1;// use unique thread for subtitles due small file size
+            fileName += ".srt";// final subtitle format
+        } else {
+            threads = threadsSeekBar.getProgress() + 1;
+            fileName += "." + stream.getFormat().getSuffix();
+        }
+
+        final String finalFileName = fileName;
+
+        DownloadManagerService.checkForRunningMission(context, location, fileName, (listed, finished) -> {
+            if (listed) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                builder.setTitle(R.string.download_dialog_title)
+                        .setMessage(finished ? R.string.overwrite_warning : R.string.download_already_running)
+                        .setPositiveButton(
+                                finished ? R.string.overwrite : R.string.generate_unique_name,
+                                (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
+                        )
+                        .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+                            dialog.cancel();
+                        })
+                        .create()
+                        .show();
+            } else {
+                downloadSelected(context, stream, location, finalFileName, kind, threads);
+            }
+        });
+    }
+
+    private void downloadSelected(Context context, Stream selectedStream, String location, String fileName, char kind, int threads) {
+        String[] urls;
+        String psName = null;
+        String[] psArgs = null;
+        String secondaryStreamUrl = null;
+        long nearLength = 0;
+
+        if (selectedStream instanceof VideoStream) {
+            SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
+                    .getAllSecondary()
+                    .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+            if (secondaryStream != null) {
+                secondaryStreamUrl = secondaryStream.getStream().getUrl();
+                psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
+                psArgs = null;
+                long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+                // set nearLength, only, if both sizes are fetched or known. this probably does not work on slow networks
+                if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+                    nearLength = secondaryStream.getSizeInBytes() + videoSize;
+                }
+            }
+        } else if ((selectedStream instanceof SubtitlesStream) && selectedStream.getFormat() == MediaFormat.TTML) {
+            psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+            psArgs = new String[]{
+                    selectedStream.getFormat().getSuffix(),
+                    "false",// ignore empty frames
+                    "false",// detect youtube duplicate lines
+            };
+        }
+
+        if (secondaryStreamUrl == null) {
+            urls = new String[]{selectedStream.getUrl()};
+        } else {
+            urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+        }
+
+        DownloadManagerService.startMission(context, urls, location, fileName, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
 
-        DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
         getDialog().dismiss();
     }
 }

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

@@ -1,38 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
-
-public class ExtSDDownloadFailedActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        new AlertDialog.Builder(this)
-                .setTitle(R.string.download_to_sdcard_error_title)
-                .setMessage(R.string.download_to_sdcard_error_message)
-                .setPositiveButton(R.string.yes, (DialogInterface dialogInterface, int i) -> {
-                    NewPipeSettings.resetDownloadFolders(this);
-                    finish();
-                })
-                .setNegativeButton(R.string.cancel, (DialogInterface dialogInterface, int i) -> {
-                    dialogInterface.dismiss();
-                    finish();
-                })
-                .create()
-                .show();
-    }
-}

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -63,6 +63,7 @@ import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
@@ -73,7 +74,6 @@ import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
@@ -371,14 +371,14 @@ public class VideoDetailFragment
                     Log.w(TAG, "Can't open channel because we got no channel URL");
                 } else {
                     try {
-                        NavigationHelper.openChannelFragment(
+                    NavigationHelper.openChannelFragment(
-                                getFragmentManager(),
+                            getFragmentManager(),
-                                currentInfo.getServiceId(),
+                            currentInfo.getServiceId(),
-                                currentInfo.getUploaderUrl(),
+                            currentInfo.getUploaderUrl(),
-                                currentInfo.getUploaderName());
+                            currentInfo.getUploaderName());
                     } catch (Exception e) {
                         ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
-                    }
+                }
                 }
                 break;
             case R.id.detail_thumbnail_root_layout:
@@ -745,7 +745,7 @@ public class VideoDetailFragment
         sortedVideoStreams = ListHelper.getSortedStreamVideosList(activity, info.getVideoStreams(), info.getVideoOnlyStreams(), false);
         selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(activity, sortedVideoStreams);
 
-        final StreamItemAdapter<VideoStream> streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams), isExternalPlayerEnabled);
+        final StreamItemAdapter<VideoStream, Stream> streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams, activity), isExternalPlayerEnabled);
         spinnerToolbar.setAdapter(streamsAdapter);
         spinnerToolbar.setSelection(selectedVideoStreamIndex);
         spinnerToolbar.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -921,7 +921,7 @@ public class VideoDetailFragment
                 .getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
             startOnExternalPlayer(activity, currentInfo, selectedVideoStream);
         } else {
-            openNormalPlayer(selectedVideoStream);
+            openNormalPlayer();
         }
     }
 
@@ -934,24 +934,13 @@ public class VideoDetailFragment
         }
     }
 
-    private void openNormalPlayer(VideoStream selectedVideoStream) {
+    private void openNormalPlayer() {
         Intent mIntent;
-        boolean useOldPlayer = PlayerHelper.isUsingOldPlayer(activity) || (Build.VERSION.SDK_INT < 16);
+        final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
-        if (!useOldPlayer) {
+        mIntent = NavigationHelper.getPlayerIntent(activity,
-            // ExoPlayer
+                MainVideoPlayer.class,
-            final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
+                playQueue,
-            mIntent = NavigationHelper.getPlayerIntent(activity,
+                getSelectedVideoStream().getResolution());
-                    MainVideoPlayer.class,
-                    playQueue,
-                    getSelectedVideoStream().getResolution());
-        } else {
-            // Internal Player
-            mIntent = new Intent(activity, PlayVideoActivity.class)
-                    .putExtra(PlayVideoActivity.VIDEO_TITLE, currentInfo.getName())
-                    .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.getUrl())
-                    .putExtra(PlayVideoActivity.VIDEO_URL, currentInfo.getUrl())
-                    .putExtra(PlayVideoActivity.START_POSITION, currentInfo.getStartPosition());
-        }
         startActivity(mIntent);
     }
 
@@ -1276,6 +1265,7 @@ public class VideoDetailFragment
                 downloadDialog.setVideoStreams(sortedVideoStreams);
                 downloadDialog.setAudioStreams(currentInfo.getAudioStreams());
                 downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
 
                 downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
             } catch (Exception e) {
@@ -1333,4 +1323,4 @@ public class VideoDetailFragment
             relatedStreamRootLayout.setVisibility(visibility);
         }
     }
-}
+}

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

@@ -1134,6 +1134,7 @@ public abstract class BasePlayer implements
     }
 
     public boolean isPlaying() {
+        if (simpleExoPlayer == null) return false;
         final int state = simpleExoPlayer.getPlaybackState();
         return (state == Player.STATE_READY || state == Player.STATE_BUFFERING)
                 && simpleExoPlayer.getPlayWhenReady();

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

@@ -900,6 +900,11 @@ public final class MainVideoPlayer extends AppCompatActivity
                 public void onMove(int sourceIndex, int targetIndex) {
                     if (playQueue != null) playQueue.move(sourceIndex, targetIndex);
                 }
+
+                @Override
+                public void onSwiped(int index) {
+                    if(index != -1) playQueue.remove(index);
+                }
             };
         }
 

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

@@ -68,7 +68,6 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.event.PlayerEventListener;
 import org.schabi.newpipe.player.helper.LockManager;
 import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.resolver.MediaSourceTag;
 import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
 import org.schabi.newpipe.util.ListHelper;
@@ -80,7 +79,6 @@ import java.util.List;
 import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
 import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
-import static org.schabi.newpipe.player.helper.PlayerHelper.isUsingOldPlayer;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 /**
@@ -554,27 +552,17 @@ public final class PopupVideoPlayer extends Service {
             if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
 
             setRecovery();
-            Intent intent;
+            final Intent intent = NavigationHelper.getPlayerIntent(
-            if (!isUsingOldPlayer(getApplicationContext())) {
+                    context,
-                intent = NavigationHelper.getPlayerIntent(
+                    MainVideoPlayer.class,
-                        context,
+                    this.getPlayQueue(),
-                        MainVideoPlayer.class,
+                    this.getRepeatMode(),
-                        this.getPlayQueue(),
+                    this.getPlaybackSpeed(),
-                        this.getRepeatMode(),
+                    this.getPlaybackPitch(),
-                        this.getPlaybackSpeed(),
+                    this.getPlaybackSkipSilence(),
-                        this.getPlaybackPitch(),
+                    this.getPlaybackQuality()
-                        this.getPlaybackSkipSilence(),
+            );
-                        this.getPlaybackQuality()
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                );
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            } else {
-                intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
-                        .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
-                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedVideoStream().getUrl())
-                        .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
-                        .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            }
             context.startActivity(intent);
             closePopup();
         }

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

@@ -375,6 +375,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
             public void onMove(int sourceIndex, int targetIndex) {
                 if (player != null) player.getPlayQueue().move(sourceIndex, targetIndex);
             }
+
+            @Override
+            public void onSwiped(int index) {
+                if (index != -1) player.getPlayQueue().remove(index);
+            }
         };
     }
 

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -19,11 +19,11 @@ import com.google.android.exoplayer2.util.MimeTypes;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -87,7 +87,7 @@ public class PlayerHelper {
         return pitchFormatter.format(pitch);
     }
 
-    public static String mimeTypesOf(final SubtitlesFormat format) {
+    public static String subtitleMimeTypesOf(final MediaFormat format) {
         switch (format) {
             case VTT: return MimeTypes.TEXT_VTT;
             case TTML: return MimeTypes.APPLICATION_TTML;
@@ -97,8 +97,8 @@ public class PlayerHelper {
 
     @NonNull
     public static String captionLanguageOf(@NonNull final Context context,
-                                           @NonNull final Subtitles subtitles) {
+                                           @NonNull final SubtitlesStream subtitles) {
-        final String displayName = subtitles.getLocale().getDisplayName(subtitles.getLocale());
+        final String displayName = subtitles.getDisplayLanguageName();
         return displayName + (subtitles.isAutoGenerated() ? " (" + context.getString(R.string.caption_auto_generated)+ ")" : "");
     }
 
@@ -145,7 +145,7 @@ public class PlayerHelper {
 
         final StreamInfoItem nextVideo = info.getNextVideo();
         if (nextVideo != null && !urls.contains(nextVideo.getUrl())) {
-            return new SinglePlayQueue(nextVideo);
+            return getAutoQueuedSinglePlayQueue(nextVideo);
         }
 
         final List<InfoItem> relatedItems = info.getRelatedStreams();
@@ -158,7 +158,7 @@ public class PlayerHelper {
             }
         }
         Collections.shuffle(autoQueueItems);
-        return autoQueueItems.isEmpty() ? null : new SinglePlayQueue(autoQueueItems.get(0));
+        return autoQueueItems.isEmpty() ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
     }
 
     ////////////////////////////////////////////////////////////////////////////
@@ -177,10 +177,6 @@ public class PlayerHelper {
         return isBrightnessGestureEnabled(context, true);
     }
 
-    public static boolean isUsingOldPlayer(@NonNull final Context context) {
-        return isUsingOldPlayer(context, false);
-    }
-
     public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
         return isRememberingPopupDimensions(context, true);
     }
@@ -318,10 +314,6 @@ public class PlayerHelper {
         return getPreferences(context).getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
     }
 
-    private static boolean isUsingOldPlayer(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.use_old_player_key), b);
-    }
-
     private static boolean isRememberingPopupDimensions(@NonNull final Context context, final boolean b) {
         return getPreferences(context).getBoolean(context.getString(R.string.popup_remember_size_pos_key), b);
     }
@@ -358,4 +350,10 @@ public class PlayerHelper {
         return getPreferences(context).getString(context.getString(R.string.minimize_on_exit_key),
                 key);
     }
+
+    private static SinglePlayQueue getAutoQueuedSinglePlayQueue(StreamInfoItem streamInfoItem) {
+        SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
+        singlePlayQueue.getItem().setAutoQueued(true);
+        return singlePlayQueue;
+    }
 }

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

@@ -1,369 +0,0 @@
-package org.schabi.newpipe.player.old;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.ProgressBar;
-import android.widget.VideoView;
-
-import org.schabi.newpipe.R;
-
-/*
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * PlayVideoActivity.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 PlayVideoActivity extends AppCompatActivity {
-
-    //// TODO: 11.09.15 add "choose stream" menu 
-    
-    private static final String TAG = PlayVideoActivity.class.toString();
-    public static final String VIDEO_URL = "video_url";
-    public static final String STREAM_URL = "stream_url";
-    public static final String VIDEO_TITLE = "video_title";
-    private static final String POSITION = "position";
-    public static final String START_POSITION = "start_position";
-
-    private static final long HIDING_DELAY = 3000;
-
-    private String videoUrl = "";
-
-    private ActionBar actionBar;
-    private VideoView videoView;
-    private int position;
-    private MediaController mediaController;
-    private ProgressBar progressBar;
-    private View decorView;
-    private boolean uiIsHidden;
-    private static long lastUiShowTime;
-    private boolean isLandscape = true;
-    private boolean hasSoftKeys;
-
-    private SharedPreferences prefs;
-    private static final String PREF_IS_LANDSCAPE = "is_landscape";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_play_video);
-        setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
-        //set background arrow style
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp);
-
-        isLandscape = checkIfLandscape();
-        hasSoftKeys = checkIfHasSoftKeys();
-
-        actionBar = getSupportActionBar();
-        assert actionBar != null;
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        Intent intent = getIntent();
-        if(mediaController == null) {
-            //prevents back button hiding media controller controls (after showing them)
-            //instead of exiting video
-            //see http://stackoverflow.com/questions/6051825
-            //also solves https://github.com/theScrabi/NewPipe/issues/99
-            mediaController = new MediaController(this) {
-                @Override
-                public boolean dispatchKeyEvent(KeyEvent event) {
-                    int keyCode = event.getKeyCode();
-                    final boolean uniqueDown = event.getRepeatCount() == 0
-                            && event.getAction() == KeyEvent.ACTION_DOWN;
-                    if (keyCode == KeyEvent.KEYCODE_BACK) {
-                        if (uniqueDown)
-                        {
-                            if (isShowing()) {
-                                finish();
-                            } else {
-                                hide();
-                            }
-                        }
-                        return true;
-                    }
-                    return super.dispatchKeyEvent(event);
-                }
-            };
-        }
-
-        position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
-
-        videoView = findViewById(R.id.video_view);
-        progressBar = findViewById(R.id.play_video_progress_bar);
-        try {
-            videoView.setMediaController(mediaController);
-            videoView.setVideoURI(Uri.parse(intent.getStringExtra(STREAM_URL)));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        videoView.requestFocus();
-        videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-            @Override
-            public void onPrepared(MediaPlayer mp) {
-                progressBar.setVisibility(View.GONE);
-                videoView.seekTo(position);
-                if (position <= 0) {
-                    videoView.start();
-                    showUi();
-                } else {
-                    videoView.pause();
-                }
-            }
-        });
-        videoUrl = intent.getStringExtra(VIDEO_URL);
-
-        Button button = findViewById(R.id.content_button);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if(uiIsHidden) {
-                    showUi();
-                } else {
-                    hideUi();
-                }
-            }
-        });
-        decorView = getWindow().getDecorView();
-        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-            @Override
-            public void onSystemUiVisibilityChange(int visibility) {
-                if (visibility == View.VISIBLE && uiIsHidden) {
-                    showUi();
-                }
-            }
-        });
-
-        if (android.os.Build.VERSION.SDK_INT >= 17) {
-            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-        }
-
-        prefs = getPreferences(Context.MODE_PRIVATE);
-        if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
-            toggleOrientation();
-        }
-    }
-
-    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.video_player, menu);
-
-        return true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        videoView.pause();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        prefs = getPreferences(Context.MODE_PRIVATE);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch(id) {
-            case android.R.id.home:
-                finish();
-                break;
-            case R.id.menu_item_share:
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
-                intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
-                break;
-            case R.id.menu_item_screen_rotation:
-                toggleOrientation();
-                break;
-            default:
-                Log.e(TAG, "Error: MenuItem not known");
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration config) {
-        super.onConfigurationChanged(config);
-
-        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            isLandscape = true;
-            adjustMediaControlMetrics();
-        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
-            isLandscape = false;
-            adjustMediaControlMetrics();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        //savedInstanceState.putInt(POSITION, videoView.getCurrentPosition());
-        //videoView.pause();
-    }
-
-    @Override
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        position = savedInstanceState.getInt(POSITION);
-        //videoView.seekTo(position);
-    }
-
-    private void showUi() {
-        try {
-            uiIsHidden = false;
-            mediaController.show(100000);
-            actionBar.show();
-            adjustMediaControlMetrics();
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            Handler handler = new Handler();
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
-                        hideUi();
-                    }
-                }
-            }, HIDING_DELAY);
-            lastUiShowTime = System.currentTimeMillis();
-        }catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void hideUi() {
-        uiIsHidden = true;
-        actionBar.hide();
-        mediaController.hide();
-        if (android.os.Build.VERSION.SDK_INT >= 17) {
-            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-        }
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    }
-
-    private void adjustMediaControlMetrics() {
-        MediaController.LayoutParams mediaControllerLayout
-                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
-                MediaController.LayoutParams.WRAP_CONTENT);
-
-        if(!hasSoftKeys) {
-            mediaControllerLayout.setMargins(20, 0, 20, 20);
-        } else {
-            int width = getNavigationBarWidth();
-            int height = getNavigationBarHeight();
-            mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
-        }
-        mediaController.setLayoutParams(mediaControllerLayout);
-    }
-
-    private boolean checkIfHasSoftKeys(){
-        return Build.VERSION.SDK_INT >= 17 ||
-                getNavigationBarHeight() != 0 ||
-                getNavigationBarWidth() != 0;
-    }
-
-    private int getNavigationBarHeight() {
-        if(Build.VERSION.SDK_INT >= 17) {
-            Display d = getWindowManager().getDefaultDisplay();
-
-            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
-            d.getRealMetrics(realDisplayMetrics);
-            DisplayMetrics displayMetrics = new DisplayMetrics();
-            d.getMetrics(displayMetrics);
-
-            int realHeight = realDisplayMetrics.heightPixels;
-            int displayHeight = displayMetrics.heightPixels;
-            return realHeight - displayHeight;
-        } else {
-            return 50;
-        }
-    }
-
-    private int getNavigationBarWidth() {
-        if(Build.VERSION.SDK_INT >= 17) {
-            Display d = getWindowManager().getDefaultDisplay();
-
-            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
-            d.getRealMetrics(realDisplayMetrics);
-            DisplayMetrics displayMetrics = new DisplayMetrics();
-            d.getMetrics(displayMetrics);
-
-            int realWidth = realDisplayMetrics.widthPixels;
-            int displayWidth = displayMetrics.widthPixels;
-            return realWidth - displayWidth;
-        } else {
-            return 50;
-        }
-    }
-
-    private boolean checkIfLandscape() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        return displayMetrics.heightPixels < displayMetrics.widthPixels;
-    }
-
-    private void toggleOrientation() {
-        if(isLandscape)  {
-            isLandscape = false;
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        } else {
-            isLandscape = true;
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        }
-        SharedPreferences.Editor editor = prefs.edit();
-        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
-        editor.apply();
-    }
-}

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java

@@ -233,6 +233,9 @@ public abstract class PlayQueue implements Serializable {
             backup.addAll(itemList);
             Collections.shuffle(itemList);
         }
+        if (!streams.isEmpty() && streams.get(streams.size() - 1).isAutoQueued() && !itemList.get(0).isAutoQueued()) {
+            streams.remove(streams.size() - 1);
+        }
         streams.addAll(itemList);
 
         broadcast(new AppendEvent(itemList.size()));
@@ -314,7 +317,9 @@ public abstract class PlayQueue implements Serializable {
             queueIndex.incrementAndGet();
         }
 
-        streams.add(target, streams.remove(source));
+        PlayQueueItem playQueueItem = streams.remove(source);
+        playQueueItem.setAutoQueued(false);
+        streams.add(target, playQueueItem);
         broadcast(new MoveEvent(source, target));
     }
 

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java

@@ -25,9 +25,10 @@ public class PlayQueueItem implements Serializable {
     @NonNull final private String uploader;
     @NonNull final private StreamType streamType;
 
+    private boolean isAutoQueued;
+
     private long recoveryPosition;
     private Throwable error;
-
     PlayQueueItem(@NonNull final StreamInfo info) {
         this(info.getName(), info.getUrl(), info.getServiceId(), info.getDuration(),
                 info.getThumbnailUrl(), info.getUploaderName(), info.getStreamType());
@@ -105,6 +106,14 @@ public class PlayQueueItem implements Serializable {
                 .doOnError(throwable -> error = throwable);
     }
 
+    public boolean isAutoQueued() {
+        return isAutoQueued;
+    }
+
+    public void setAutoQueued(boolean autoQueued) {
+        isAutoQueued = autoQueued;
+    }
+
     ////////////////////////////////////////////////////////////////////////////
     // Item States, keep external access out
     ////////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java

@@ -8,11 +8,13 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
     private static final int MAXIMUM_INITIAL_DRAG_VELOCITY = 25;
 
     public PlayQueueItemTouchCallback() {
-        super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+        super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.RIGHT);
     }
 
     public abstract void onMove(final int sourceIndex, final int targetIndex);
 
+    public abstract void onSwiped(int index);
+
     @Override
     public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
                                             int viewSizeOutOfBounds, int totalSize,
@@ -44,9 +46,11 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
 
     @Override
     public boolean isItemViewSwipeEnabled() {
-        return false;
+        return true;
     }
 
     @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {}
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+        onSwiped(viewHolder.getAdapterPosition());
+    }
 }

app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java

@@ -10,7 +10,7 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
 
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
@@ -93,8 +93,8 @@ public class VideoPlaybackResolver implements PlaybackResolver {
         // Below are auxiliary media sources
 
         // Create subtitle sources
-        for (final Subtitles subtitle : info.getSubtitles()) {
+        for (final SubtitlesStream subtitle : info.getSubtitles()) {
-            final String mimeType = PlayerHelper.mimeTypesOf(subtitle.getFileType());
+            final String mimeType = PlayerHelper.subtitleMimeTypesOf(subtitle.getFormat());
             if (mimeType == null) continue;
 
             final Format textFormat = Format.createTextSampleFormat(null, mimeType,

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.v7.preference.Preference;
 
 import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.CheckForNewAppVersionTask;
 import org.schabi.newpipe.R;
 
 public class MainSettingsFragment extends BasePreferenceFragment {
@@ -13,6 +14,13 @@ public class MainSettingsFragment extends BasePreferenceFragment {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.main_settings);
 
+        if (!CheckForNewAppVersionTask.isGithubApk()) {
+            final Preference update = findPreference(getString(R.string.update_pref_screen_key));
+            getPreferenceScreen().removePreference(update);
+
+            defaultPreferences.edit().putBoolean(getString(R.string.update_app_key), false).apply();
+        }
+
         if (!DEBUG) {
             final Preference debug = findPreference(getString(R.string.debug_pref_screen_key));
             getPreferenceScreen().removePreference(debug);

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

@@ -0,0 +1,33 @@
+package org.schabi.newpipe.settings;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.Preference;
+
+import org.schabi.newpipe.CheckForNewAppVersionTask;
+import org.schabi.newpipe.R;
+
+public class UpdateSettingsFragment extends BasePreferenceFragment {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        String updateToggleKey = getString(R.string.update_app_key);
+        findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
+    }
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.update_settings);
+    }
+
+    private Preference.OnPreferenceChangeListener updatePreferenceChange
+            = (preference, newValue) ->  {
+
+        defaultPreferences.edit().putBoolean(getString(R.string.update_app_key),
+                (boolean) newValue).apply();
+
+        return true;
+    };
+}

app/src/main/java/org/schabi/newpipe/streams/DataReader.java

@@ -0,0 +1,103 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ * @author kapodamy
+ */
+public class DataReader {
+
+    public final static int SHORT_SIZE = 2;
+    public final static int LONG_SIZE = 8;
+    public final static int INTEGER_SIZE = 4;
+    public final static int FLOAT_SIZE = 4;
+
+    private long pos;
+    public final SharpStream stream;
+    private final boolean rewind;
+
+    public DataReader(SharpStream stream) {
+        this.rewind = stream.canRewind();
+        this.stream = stream;
+        this.pos = 0L;
+    }
+
+    public long position() {
+        return pos;
+    }
+
+    public final int readInt() throws IOException {
+        primitiveRead(INTEGER_SIZE);
+        return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+    }
+
+    public final int read() throws IOException {
+        int value = stream.read();
+        if (value == -1) {
+            throw new EOFException();
+        }
+
+        pos++;
+        return value;
+    }
+
+    public final long skipBytes(long amount) throws IOException {
+        amount = stream.skip(amount);
+        pos += amount;
+        return amount;
+    }
+
+    public final long readLong() throws IOException {
+        primitiveRead(LONG_SIZE);
+        long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+        long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
+        return high << 32 | low;
+    }
+
+    public final short readShort() throws IOException {
+        primitiveRead(SHORT_SIZE);
+        return (short) (primitive[0] << 8 | primitive[1]);
+    }
+
+    public final int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+
+    public final int read(byte[] buffer, int offset, int count) throws IOException {
+        int res = stream.read(buffer, offset, count);
+        pos += res;
+
+        return res;
+    }
+
+    public final boolean available() {
+        return stream.available() > 0;
+    }
+
+    public void rewind() throws IOException {
+        stream.rewind();
+        pos = 0;
+    }
+
+    public boolean canRewind() {
+        return rewind;
+    }
+
+    private short[] primitive = new short[LONG_SIZE];
+
+    private void primitiveRead(int amount) throws IOException {
+        byte[] buffer = new byte[amount];
+        int read = stream.read(buffer, 0, amount);
+        pos += read;
+        if (read != amount) {
+            throw new EOFException("Truncated data, missing " + String.valueOf(amount - read) + " bytes");
+        }
+
+        for (int i = 0; i < buffer.length; i++) {
+            primitive[i] = (short) (buffer[i] & 0xFF);// the "byte" datatype is signed and is very annoying
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java

@@ -0,0 +1,817 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import java.nio.ByteBuffer;
+
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ * @author kapodamy
+ */
+public class Mp4DashReader {
+
+    // <editor-fold defaultState="collapsed" desc="Constants">
+    private static final int ATOM_MOOF = 0x6D6F6F66;
+    private static final int ATOM_MFHD = 0x6D666864;
+    private static final int ATOM_TRAF = 0x74726166;
+    private static final int ATOM_TFHD = 0x74666864;
+    private static final int ATOM_TFDT = 0x74666474;
+    private static final int ATOM_TRUN = 0x7472756E;
+    private static final int ATOM_MDIA = 0x6D646961;
+    private static final int ATOM_FTYP = 0x66747970;
+    private static final int ATOM_SIDX = 0x73696478;
+    private static final int ATOM_MOOV = 0x6D6F6F76;
+    private static final int ATOM_MDAT = 0x6D646174;
+    private static final int ATOM_MVHD = 0x6D766864;
+    private static final int ATOM_TRAK = 0x7472616B;
+    private static final int ATOM_MVEX = 0x6D766578;
+    private static final int ATOM_TREX = 0x74726578;
+    private static final int ATOM_TKHD = 0x746B6864;
+    private static final int ATOM_MFRA = 0x6D667261;
+    private static final int ATOM_TFRA = 0x74667261;
+    private static final int ATOM_MDHD = 0x6D646864;
+    private static final int BRAND_DASH = 0x64617368;
+    // </editor-fold>
+
+    private final DataReader stream;
+
+    private Mp4Track[] tracks = null;
+
+    private Box box;
+    private Moof moof;
+
+    private boolean chunkZero = false;
+
+    private int selectedTrack = -1;
+
+    public enum TrackKind {
+        Audio, Video, Other
+    }
+
+    public Mp4DashReader(SharpStream source) {
+        this.stream = new DataReader(source);
+    }
+
+    public void parse() throws IOException, NoSuchElementException {
+        if (selectedTrack > -1) {
+            return;
+        }
+
+        box = readBox(ATOM_FTYP);
+        if (parse_ftyp() != BRAND_DASH) {
+            throw new NoSuchElementException("Main Brand is not dash");
+        }
+
+        Moov moov = null;
+        int i;
+
+        while (box.type != ATOM_MOOF) {
+            ensure(box);
+            box = readBox();
+
+            switch (box.type) {
+                case ATOM_MOOV:
+                    moov = parse_moov(box);
+                    break;
+                case ATOM_SIDX:
+                    break;
+                case ATOM_MFRA:
+                    break;
+                case ATOM_MDAT:
+                    throw new IOException("Expected moof, found mdat");
+            }
+        }
+
+        if (moov == null) {
+            throw new IOException("The provided Mp4 doesn't have the 'moov' box");
+        }
+
+        tracks = new Mp4Track[moov.trak.length];
+
+        for (i = 0; i < tracks.length; i++) {
+            tracks[i] = new Mp4Track();
+            tracks[i].trak = moov.trak[i];
+
+            if (moov.mvex_trex != null) {
+                for (Trex mvex_trex : moov.mvex_trex) {
+                    if (tracks[i].trak.tkhd.trackId == mvex_trex.trackId) {
+                        tracks[i].trex = mvex_trex;
+                    }
+                }
+            }
+
+            if (moov.trak[i].tkhd.bHeight == 0 && moov.trak[i].tkhd.bWidth == 0) {
+                tracks[i].kind = moov.trak[i].tkhd.bVolume == 0 ? TrackKind.Other : TrackKind.Audio;
+            } else {
+                tracks[i].kind = TrackKind.Video;
+            }
+        }
+    }
+
+    public Mp4Track selectTrack(int index) {
+        selectedTrack = index;
+        return tracks[index];
+    }
+
+    /**
+     * Count all fragments present. This operation requires a seekable stream
+     *
+     * @return list with a basic info
+     * @throws IOException if the source stream is not seekeable
+     */
+    public int getFragmentsCount() throws IOException {
+        if (selectedTrack < 0) {
+            throw new IllegalStateException("track no selected");
+        }
+        if (!stream.canRewind()) {
+            throw new IOException("The provided stream doesn't allow seek");
+        }
+
+        Box tmp;
+        int count = 0;
+        long orig_offset = stream.position();
+
+        if (box.type == ATOM_MOOF) {
+            tmp = box;
+        } else {
+            ensure(box);
+            tmp = readBox();
+        }
+
+        do {
+            if (tmp.type == ATOM_MOOF) {
+                ensure(readBox(ATOM_MFHD));
+                Box traf;
+                while ((traf = untilBox(tmp, ATOM_TRAF)) != null) {
+                    Box tfhd = readBox(ATOM_TFHD);
+                    if (parse_tfhd(tracks[selectedTrack].trak.tkhd.trackId) != null) {
+                        count++;
+                        break;
+                    }
+                    ensure(tfhd);
+                    ensure(traf);
+                }
+            }
+            ensure(tmp);
+        } while (stream.available() && (tmp = readBox()) != null);
+
+        stream.rewind();
+        stream.skipBytes((int) orig_offset);
+
+        return count;
+    }
+
+    public Mp4Track[] getAvailableTracks() {
+        return tracks;
+    }
+
+    public Mp4TrackChunk getNextChunk() throws IOException {
+        Mp4Track track = tracks[selectedTrack];
+
+        while (stream.available()) {
+
+            if (chunkZero) {
+                ensure(box);
+                if (!stream.available()) {
+                    break;
+                }
+                box = readBox();
+            } else {
+                chunkZero = true;
+            }
+
+            switch (box.type) {
+                case ATOM_MOOF:
+                    if (moof != null) {
+                        throw new IOException("moof found without mdat");
+                    }
+
+                    moof = parse_moof(box, track.trak.tkhd.trackId);
+
+                    if (moof.traf != null) {
+
+                        if (hasFlag(moof.traf.trun.bFlags, 0x0001)) {
+                            moof.traf.trun.dataOffset -= box.size + 8;
+                            if (moof.traf.trun.dataOffset < 0) {
+                                throw new IOException("trun box has wrong data offset, points outside of concurrent mdat box");
+                            }
+                        }
+
+                        if (moof.traf.trun.chunkSize < 1) {
+                            if (hasFlag(moof.traf.tfhd.bFlags, 0x10)) {
+                                moof.traf.trun.chunkSize = moof.traf.tfhd.defaultSampleSize * moof.traf.trun.entryCount;
+                            } else {
+                                moof.traf.trun.chunkSize = box.size - 8;
+                            }
+                        }
+                        if (!hasFlag(moof.traf.trun.bFlags, 0x900) && moof.traf.trun.chunkDuration == 0) {
+                            if (hasFlag(moof.traf.tfhd.bFlags, 0x20)) {
+                                moof.traf.trun.chunkDuration = moof.traf.tfhd.defaultSampleDuration * moof.traf.trun.entryCount;
+                            }
+                        }
+                    }
+                    break;
+                case ATOM_MDAT:
+                    if (moof == null) {
+                        throw new IOException("mdat found without moof");
+                    }
+
+                    if (moof.traf == null) {
+                        moof = null;
+                        continue;// find another chunk
+                    }
+
+                    Mp4TrackChunk chunk = new Mp4TrackChunk();
+                    chunk.moof = moof;
+                    chunk.data = new TrackDataChunk(stream, moof.traf.trun.chunkSize);
+                    moof = null;
+
+                    stream.skipBytes(chunk.moof.traf.trun.dataOffset);
+                    return chunk;
+                default:
+            }
+        }
+
+        return null;
+    }
+
+    // <editor-fold defaultState="collapsed" desc="Utils">
+    private long readUint() throws IOException {
+        return stream.readInt() & 0xffffffffL;
+    }
+
+    public static boolean hasFlag(int flags, int mask) {
+        return (flags & mask) == mask;
+    }
+
+    private String boxName(Box ref) {
+        return boxName(ref.type);
+    }
+
+    private String boxName(int type) {
+        try {
+            return new String(ByteBuffer.allocate(4).putInt(type).array(), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return "0x" + Integer.toHexString(type);
+        }
+    }
+
+    private Box readBox() throws IOException {
+        Box b = new Box();
+        b.offset = stream.position();
+        b.size = stream.readInt();
+        b.type = stream.readInt();
+
+        return b;
+    }
+
+    private Box readBox(int expected) throws IOException {
+        Box b = readBox();
+        if (b.type != expected) {
+            throw new NoSuchElementException("expected " + boxName(expected) + " found " + boxName(b));
+        }
+        return b;
+    }
+
+    private void ensure(Box ref) throws IOException {
+        long skip = ref.offset + ref.size - stream.position();
+
+        if (skip == 0) {
+            return;
+        } else if (skip < 0) {
+            throw new EOFException(String.format(
+                    "parser go beyond limits of the box. type=%s offset=%s size=%s position=%s",
+                    boxName(ref), ref.offset, ref.size, stream.position()
+            ));
+        }
+
+        stream.skipBytes((int) skip);
+    }
+
+    private Box untilBox(Box ref, int... expected) throws IOException {
+        Box b;
+        while (stream.position() < (ref.offset + ref.size)) {
+            b = readBox();
+            for (int type : expected) {
+                if (b.type == type) {
+                    return b;
+                }
+            }
+            ensure(b);
+        }
+
+        return null;
+    }
+
+    // </editor-fold>
+
+    // <editor-fold defaultState="collapsed" desc="Box readers">
+
+    private Moof parse_moof(Box ref, int trackId) throws IOException {
+        Moof obj = new Moof();
+
+        Box b = readBox(ATOM_MFHD);
+        obj.mfhd_SequenceNumber = parse_mfhd();
+        ensure(b);
+
+        while ((b = untilBox(ref, ATOM_TRAF)) != null) {
+            obj.traf = parse_traf(b, trackId);
+            ensure(b);
+
+            if (obj.traf != null) {
+                return obj;
+            }
+        }
+        
+        return obj;
+    }
+
+    private int parse_mfhd() throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        return stream.readInt();
+    }
+
+    private Traf parse_traf(Box ref, int trackId) throws IOException {
+        Traf traf = new Traf();
+
+        Box b = readBox(ATOM_TFHD);
+        traf.tfhd = parse_tfhd(trackId);
+        ensure(b);
+
+        if (traf.tfhd == null) {
+            return null;
+        }
+
+        b = untilBox(ref, ATOM_TRUN, ATOM_TFDT);
+
+        if (b.type == ATOM_TFDT) {
+            traf.tfdt = parse_tfdt();
+            ensure(b);
+            b = readBox(ATOM_TRUN);
+        }
+
+        traf.trun = parse_trun();
+        ensure(b);
+
+        return traf;
+    }
+
+    private Tfhd parse_tfhd(int trackId) throws IOException {
+        Tfhd obj = new Tfhd();
+
+        obj.bFlags = stream.readInt();
+        obj.trackId = stream.readInt();
+
+        if (trackId != -1 && obj.trackId != trackId) {
+            return null;
+        }
+
+        if (hasFlag(obj.bFlags, 0x01)) {
+            stream.skipBytes(8);
+        }
+        if (hasFlag(obj.bFlags, 0x02)) {
+            stream.skipBytes(4);
+        }
+        if (hasFlag(obj.bFlags, 0x08)) {
+            obj.defaultSampleDuration = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x10)) {
+            obj.defaultSampleSize = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x20)) {
+            obj.defaultSampleFlags = stream.readInt();
+        }
+
+        return obj;
+    }
+
+    private long parse_tfdt() throws IOException {
+        int version = stream.read();
+        stream.skipBytes(3);// flags     
+        return version == 0 ? readUint() : stream.readLong();
+    }
+
+    private Trun parse_trun() throws IOException {
+        Trun obj = new Trun();
+        obj.bFlags = stream.readInt();
+        obj.entryCount = stream.readInt();// unsigned int    
+
+        obj.entries_rowSize = 0;
+        if (hasFlag(obj.bFlags, 0x0100)) {
+            obj.entries_rowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0200)) {
+            obj.entries_rowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0400)) {
+            obj.entries_rowSize += 4;
+        }
+        if (hasFlag(obj.bFlags, 0x0800)) {
+            obj.entries_rowSize += 4;
+        }
+        obj.bEntries = new byte[obj.entries_rowSize * obj.entryCount];
+
+        if (hasFlag(obj.bFlags, 0x0001)) {
+            obj.dataOffset = stream.readInt();
+        }
+        if (hasFlag(obj.bFlags, 0x0004)) {
+            obj.bFirstSampleFlags = stream.readInt();
+        }
+
+        stream.read(obj.bEntries);
+
+        for (int i = 0; i < obj.entryCount; i++) {
+            TrunEntry entry = obj.getEntry(i);
+            if (hasFlag(obj.bFlags, 0x0100)) {
+                obj.chunkDuration += entry.sampleDuration;
+            }
+            if (hasFlag(obj.bFlags, 0x0200)) {
+                obj.chunkSize += entry.sampleSize;
+            }
+            if (hasFlag(obj.bFlags, 0x0800)) {
+                if (!hasFlag(obj.bFlags, 0x0100)) {
+                    obj.chunkDuration += entry.sampleCompositionTimeOffset;
+                }
+            }
+        }
+
+        return obj;
+    }
+
+    private int parse_ftyp() throws IOException {
+        int brand = stream.readInt();
+        stream.skipBytes(4);// minor version
+
+        return brand;
+    }
+
+    private Mvhd parse_mvhd() throws IOException {
+        int version = stream.read();
+        stream.skipBytes(3);// flags
+
+        // creation entries_time
+        // modification entries_time
+        stream.skipBytes(2 * (version == 0 ? 4 : 8));
+
+        Mvhd obj = new Mvhd();
+        obj.timeScale = readUint();
+
+        // chunkDuration
+        stream.skipBytes(version == 0 ? 4 : 8);
+
+        // rate
+        // volume
+        // reserved
+        // matrix array
+        // predefined
+        stream.skipBytes(76);
+
+        obj.nextTrackId = readUint();
+
+        return obj;
+    }
+
+    private Tkhd parse_tkhd() throws IOException {
+        int version = stream.read();
+
+        Tkhd obj = new Tkhd();
+
+        // flags
+        // creation entries_time
+        // modification entries_time
+        stream.skipBytes(3 + (2 * (version == 0 ? 4 : 8)));
+
+        obj.trackId = stream.readInt();
+
+        stream.skipBytes(4);// reserved
+
+        obj.duration = version == 0 ? readUint() : stream.readLong();
+
+        stream.skipBytes(2 * 4);// reserved
+
+        obj.bLayer = stream.readShort();
+        obj.bAlternateGroup = stream.readShort();
+        obj.bVolume = stream.readShort();
+
+        stream.skipBytes(2);// reserved
+
+        obj.matrix = new byte[9 * 4];
+        stream.read(obj.matrix);
+
+        obj.bWidth = stream.readInt();
+        obj.bHeight = stream.readInt();
+
+        return obj;
+    }
+
+    private Trak parse_trak(Box ref) throws IOException {
+        Trak trak = new Trak();
+
+        Box b = readBox(ATOM_TKHD);
+        trak.tkhd = parse_tkhd();
+        ensure(b);
+
+        b = untilBox(ref, ATOM_MDIA);
+        trak.mdia = new byte[b.size];
+
+        ByteBuffer buffer = ByteBuffer.wrap(trak.mdia);
+        buffer.putInt(b.size);
+        buffer.putInt(ATOM_MDIA);
+        stream.read(trak.mdia, 8, b.size - 8);
+
+        trak.mdia_mdhd_timeScale = parse_mdia(buffer);
+
+        return trak;
+    }
+
+    private int parse_mdia(ByteBuffer data) {
+        while (data.hasRemaining()) {
+            int end = data.position() + data.getInt();
+            if (data.getInt() == ATOM_MDHD) {
+                byte version = data.get();
+                data.position(data.position() + 3 + ((version == 0 ? 4 : 8) * 2));
+                return data.getInt();
+            }
+
+            data.position(end);
+        }
+
+        return 0;// this NEVER should happen
+    }
+
+    private Moov parse_moov(Box ref) throws IOException {
+        Box b = readBox(ATOM_MVHD);
+        Moov moov = new Moov();
+        moov.mvhd = parse_mvhd();
+        ensure(b);
+
+        ArrayList<Trak> tmp = new ArrayList<>((int) moov.mvhd.nextTrackId);
+        while ((b = untilBox(ref, ATOM_TRAK, ATOM_MVEX)) != null) {
+
+            switch (b.type) {
+                case ATOM_TRAK:
+                    tmp.add(parse_trak(b));
+                    break;
+                case ATOM_MVEX:
+                    moov.mvex_trex = parse_mvex(b, (int) moov.mvhd.nextTrackId);
+                    break;
+            }
+
+            ensure(b);
+        }
+
+        moov.trak = tmp.toArray(new Trak[tmp.size()]);
+
+        return moov;
+    }
+
+    private Trex[] parse_mvex(Box ref, int possibleTrackCount) throws IOException {
+        ArrayList<Trex> tmp = new ArrayList<>(possibleTrackCount);
+
+        Box b;
+        while ((b = untilBox(ref, ATOM_TREX)) != null) {
+            tmp.add(parse_trex());
+            ensure(b);
+        }
+
+        return tmp.toArray(new Trex[tmp.size()]);
+    }
+
+    private Trex parse_trex() throws IOException {
+        // version
+        // flags
+        stream.skipBytes(4);
+
+        Trex obj = new Trex();
+        obj.trackId = stream.readInt();
+        obj.defaultSampleDescriptionIndex = stream.readInt();
+        obj.defaultSampleDuration = stream.readInt();
+        obj.defaultSampleSize = stream.readInt();
+        obj.defaultSampleFlags = stream.readInt();
+
+        return obj;
+    }
+
+    private Tfra parse_tfra() throws IOException {
+        int version = stream.read();
+
+        stream.skipBytes(3);// flags
+
+        Tfra tfra = new Tfra();
+        tfra.trackId = stream.readInt();
+
+        stream.skipBytes(3);// reserved
+        int bFlags = stream.read();
+        int size_tts = ((bFlags >> 4) & 3) + ((bFlags >> 2) & 3) + (bFlags & 3);
+
+        tfra.entries_time = new int[stream.readInt()];
+
+        for (int i = 0; i < tfra.entries_time.length; i++) {
+            tfra.entries_time[i] = version == 0 ? stream.readInt() : (int) stream.readLong();
+            stream.skipBytes(size_tts + (version == 0 ? 4 : 8));
+        }
+
+        return tfra;
+    }
+
+    private Sidx parse_sidx() throws IOException {
+        int version = stream.read();
+
+        stream.skipBytes(3);// flags
+
+        Sidx obj = new Sidx();
+        obj.referenceId = stream.readInt();
+        obj.timescale = stream.readInt();
+
+        // earliest presentation entries_time
+        // first offset
+        // reserved
+        stream.skipBytes((2 * (version == 0 ? 4 : 8)) + 2);
+
+        obj.entries_subsegmentDuration = new int[stream.readShort()];
+
+        for (int i = 0; i < obj.entries_subsegmentDuration.length; i++) {
+            // reference type
+            // referenced size
+            stream.skipBytes(4);
+            obj.entries_subsegmentDuration[i] = stream.readInt();// unsigned int
+
+            // starts with SAP
+            // SAP type
+            // SAP delta entries_time
+            stream.skipBytes(4);
+        }
+
+        return obj;
+    }
+
+    private Tfra[] parse_mfra(Box ref, int trackCount) throws IOException {
+        ArrayList<Tfra> tmp = new ArrayList<>(trackCount);
+        long limit = ref.offset + ref.size;
+
+        while (stream.position() < limit) {
+            box = readBox();
+
+            if (box.type == ATOM_TFRA) {
+                tmp.add(parse_tfra());
+            }
+
+            ensure(box);
+        }
+
+        return tmp.toArray(new Tfra[tmp.size()]);
+    }
+
+    // </editor-fold>
+
+    // <editor-fold defaultState="collapsed" desc="Helper classes">
+    class Box {
+
+        int type;
+        long offset;
+        int size;
+    }
+
+    class Sidx {
+
+        int timescale;
+        int referenceId;
+        int[] entries_subsegmentDuration;
+    }
+
+    public class Moof {
+
+        int mfhd_SequenceNumber;
+        public Traf traf;
+    }
+
+    public class Traf {
+
+        public Tfhd tfhd;
+        long tfdt;
+        public Trun trun;
+    }
+
+    public class Tfhd {
+
+        int bFlags;
+        public int trackId;
+        int defaultSampleDuration;
+        int defaultSampleSize;
+        int defaultSampleFlags;
+    }
+
+    public class TrunEntry {
+
+        public int sampleDuration;
+        public int sampleSize;
+        public int sampleFlags;
+        public int sampleCompositionTimeOffset;
+    }
+
+    public class Trun {
+
+        public int chunkDuration;
+        public int chunkSize;
+
+        public int bFlags;
+        int bFirstSampleFlags;
+        int dataOffset;
+
+        public int entryCount;
+        byte[] bEntries;
+        int entries_rowSize;
+
+        public TrunEntry getEntry(int i) {
+            ByteBuffer buffer = ByteBuffer.wrap(bEntries, i * entries_rowSize, entries_rowSize);
+            TrunEntry entry = new TrunEntry();
+
+            if (hasFlag(bFlags, 0x0100)) {
+                entry.sampleDuration = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0200)) {
+                entry.sampleSize = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0400)) {
+                entry.sampleFlags = buffer.getInt();
+            }
+            if (hasFlag(bFlags, 0x0800)) {
+                entry.sampleCompositionTimeOffset = buffer.getInt();
+            }
+
+            return entry;
+        }
+    }
+
+    public class Tkhd {
+
+        int trackId;
+        long duration;
+        short bVolume;
+        int bWidth;
+        int bHeight;
+        byte[] matrix;
+        short bLayer;
+        short bAlternateGroup;
+    }
+
+    public class Trak {
+
+        public Tkhd tkhd;
+        public int mdia_mdhd_timeScale;
+
+        byte[] mdia;
+    }
+
+    class Mvhd {
+
+        long timeScale;
+        long nextTrackId;
+    }
+
+    class Moov {
+
+        Mvhd mvhd;
+        Trak[] trak;
+        Trex[] mvex_trex;
+    }
+
+    class Tfra {
+
+        int trackId;
+        int[] entries_time;
+    }
+
+    public class Trex {
+
+        private int trackId;
+        int defaultSampleDescriptionIndex;
+        int defaultSampleDuration;
+        int defaultSampleSize;
+        int defaultSampleFlags;
+    }
+
+    public class Mp4Track {
+
+        public TrackKind kind;
+        public Trak trak;
+        public Trex trex;
+    }
+
+    public class Mp4TrackChunk {
+
+        public InputStream data;
+        public Moof moof;
+    }
+//</editor-fold>
+}

app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java

@@ -0,0 +1,623 @@
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4Track;
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4TrackChunk;
+import org.schabi.newpipe.streams.Mp4DashReader.Trak;
+import org.schabi.newpipe.streams.Mp4DashReader.Trex;
+
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.schabi.newpipe.streams.Mp4DashReader.hasFlag;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class Mp4DashWriter {
+
+    private final static byte DIMENSIONAL_FIVE = 5;
+    private final static byte DIMENSIONAL_TWO = 2;
+    private final static short DEFAULT_TIMESCALE = 1000;
+    private final static int BUFFER_SIZE = 8 * 1024;
+    private final static byte DEFAULT_TREX_SIZE = 32;
+    private final static byte[] TFRA_TTS_DEFAULT = new byte[]{0x01, 0x01, 0x01};
+    private final static int EPOCH_OFFSET = 2082844800;
+
+    private Mp4Track[] infoTracks;
+    private SharpStream[] sourceTracks;
+
+    private Mp4DashReader[] readers;
+    private final long time;
+
+    private boolean done = false;
+    private boolean parsed = false;
+
+    private long written = 0;
+    private ArrayList<ArrayList<Integer>> chunkTimes;
+    private ArrayList<Long> moofOffsets;
+    private ArrayList<Integer> fragSizes;
+
+    public Mp4DashWriter(SharpStream... source) {
+        sourceTracks = source;
+        readers = new Mp4DashReader[sourceTracks.length];
+        infoTracks = new Mp4Track[sourceTracks.length];
+        time = (System.currentTimeMillis() / 1000L) + EPOCH_OFFSET;
+    }
+
+    public Mp4Track[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
+        if (!parsed) {
+            throw new IllegalStateException("All sources must be parsed first");
+        }
+
+        return readers[sourceIndex].getAvailableTracks();
+    }
+
+    public void parseSources() throws IOException, IllegalStateException {
+        if (done) {
+            throw new IllegalStateException("already done");
+        }
+        if (parsed) {
+            throw new IllegalStateException("already parsed");
+        }
+
+        try {
+            for (int i = 0; i < readers.length; i++) {
+                readers[i] = new Mp4DashReader(sourceTracks[i]);
+                readers[i].parse();
+            }
+
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public void selectTracks(int... trackIndex) throws IOException {
+        if (done) {
+            throw new IOException("already done");
+        }
+        if (chunkTimes != null) {
+            throw new IOException("tracks already selected");
+        }
+
+        try {
+            chunkTimes = new ArrayList<>(readers.length);
+            moofOffsets = new ArrayList<>(32);
+            fragSizes = new ArrayList<>(32);
+
+            for (int i = 0; i < readers.length; i++) {
+                infoTracks[i] = readers[i].selectTrack(trackIndex[i]);
+
+                chunkTimes.add(new ArrayList<Integer>(32));
+            }
+
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public long getBytesWritten() {
+        return written;
+    }
+
+    public void build(SharpStream out) throws IOException, RuntimeException {
+        if (done) {
+            throw new RuntimeException("already done");
+        }
+        if (!out.canWrite()) {
+            throw new IOException("the provided output is not writable");
+        }
+
+        long sidxOffsets = -1;
+        int maxFrags = 0;
+
+        for (SharpStream stream : sourceTracks) {
+            if (!stream.canRewind()) {
+                sidxOffsets = -2;// sidx not available
+            }
+        }
+
+        try {
+            dump(make_ftyp(), out);
+            dump(make_moov(), out);
+
+            if (sidxOffsets == -1 && out.canRewind()) {
+                //<editor-fold defaultstate="collapsed" desc="calculate sidx">
+                int reserved = 0;
+                for (Mp4DashReader reader : readers) {
+                    int count = reader.getFragmentsCount();
+                    if (count > maxFrags) {
+                        maxFrags = count;
+                    }
+                    reserved += 12 + calcSidxBodySize(count);
+                }
+                if (maxFrags > 0xFFFF) {
+                    sidxOffsets = -3;// TODO: to many fragments, needs a multi-sidx implementation
+                } else {
+                    sidxOffsets = written;
+                    dump(make_free(reserved), out);
+                }
+                //</editor-fold>
+            }
+            ArrayList<Mp4TrackChunk> chunks = new ArrayList<>(readers.length);
+            chunks.add(null);
+
+            int read;
+            byte[] buffer = new byte[BUFFER_SIZE];
+            int sequenceNumber = 1;
+
+            while (true) {
+                chunks.clear();
+
+                for (int i = 0; i < readers.length; i++) {
+                    Mp4TrackChunk chunk = readers[i].getNextChunk();
+                    if (chunk == null || chunk.moof.traf.trun.chunkSize < 1) {
+                        continue;
+                    }
+                    chunk.moof.traf.tfhd.trackId = i + 1;
+                    chunks.add(chunk);
+
+                    if (sequenceNumber == 1) {
+                        if (chunk.moof.traf.trun.entryCount > 0 && hasFlag(chunk.moof.traf.trun.bFlags, 0x0800)) {
+                            chunkTimes.get(i).add(chunk.moof.traf.trun.getEntry(0).sampleCompositionTimeOffset);
+                        } else {
+                            chunkTimes.get(i).add(0);
+                        }
+                    }
+
+                    chunkTimes.get(i).add(chunk.moof.traf.trun.chunkDuration);
+                }
+
+                if (chunks.size() < 1) {
+                    break;
+                }
+
+                long offset = written;
+                moofOffsets.add(offset);
+
+                dump(make_moof(sequenceNumber++, chunks, offset), out);
+                dump(make_mdat(chunks), out);
+
+                for (Mp4TrackChunk chunk : chunks) {
+                    while ((read = chunk.data.read(buffer)) > 0) {
+                        out.write(buffer, 0, read);
+                        written += read;
+                    }
+                }
+
+                fragSizes.add((int) (written - offset));
+            }
+
+            dump(make_mfra(), out);
+
+            if (sidxOffsets > 0 && moofOffsets.size() == maxFrags) {
+                long len = written;
+
+                out.rewind();
+                out.skip(sidxOffsets);
+
+                written = sidxOffsets;
+                sidxOffsets = moofOffsets.get(0);
+
+                for (int i = 0; i < readers.length; i++) {
+                    dump(make_sidx(i, sidxOffsets - written), out);
+                }
+
+                written = len;
+            }
+        } finally {
+            done = true;
+        }
+    }
+
+    public boolean isDone() {
+        return done;
+    }
+
+    public boolean isParsed() {
+        return parsed;
+    }
+
+    public void close() {
+        done = true;
+        parsed = true;
+
+        for (SharpStream src : sourceTracks) {
+            src.dispose();
+        }
+
+        sourceTracks = null;
+        readers = null;
+        infoTracks = null;
+        moofOffsets = null;
+        chunkTimes = null;
+    }
+
+    // <editor-fold defaultstate="collapsed" desc="Utils">
+    private void dump(byte[][] buffer, SharpStream stream) throws IOException {
+        for (byte[] buff : buffer) {
+            stream.write(buff);
+            written += buff.length;
+        }
+    }
+
+    private byte[][] lengthFor(byte[][] buffer) {
+        int length = 0;
+        for (byte[] buff : buffer) {
+            length += buff.length;
+        }
+
+        ByteBuffer.wrap(buffer[0]).putInt(length);
+
+        return buffer;
+    }
+
+    private int calcSidxBodySize(int entryCount) {
+        return 4 + 4 + 8 + 8 + 4 + (entryCount * 12);
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="collapsed" desc="Box makers">
+    private byte[][] make_moof(int sequence, ArrayList<Mp4TrackChunk> chunks, long referenceOffset) {
+        int pos = 2;
+        TrunExtra[] extra = new TrunExtra[chunks.size()];
+
+        byte[][] buffer = new byte[pos + (extra.length * DIMENSIONAL_FIVE)][];
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x66,// info header
+            0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x68, 0x64, 0x00, 0x00, 0x00, 0x00//mfhd
+        };
+        buffer[1] = new byte[4];
+        ByteBuffer.wrap(buffer[1]).putInt(sequence);
+
+        for (int i = 0; i < extra.length; i++) {
+            extra[i] = new TrunExtra();
+            for (byte[] buff : make_traf(chunks.get(i), extra[i], referenceOffset)) {
+                buffer[pos++] = buff;
+            }
+        }
+
+        lengthFor(buffer);
+
+        int offset = 8 + ByteBuffer.wrap(buffer[0]).getInt();
+
+        for (int i = 0; i < extra.length; i++) {
+            extra[i].byteBuffer.putInt(offset);
+            offset += chunks.get(i).moof.traf.trun.chunkSize;
+        }
+
+        return buffer;
+    }
+
+    private byte[][] make_traf(Mp4TrackChunk chunk, TrunExtra extra, long moofOffset) {
+        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x66,
+            0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x68, 0x64
+        };
+
+        int flags = (chunk.moof.traf.tfhd.bFlags & 0x38) | 0x01;
+        byte tfhdBodySize = 8 + 8;
+        if (hasFlag(flags, 0x08)) {
+            tfhdBodySize += 4;
+        }
+        if (hasFlag(flags, 0x10)) {
+            tfhdBodySize += 4;
+        }
+        if (hasFlag(flags, 0x20)) {
+            tfhdBodySize += 4;
+        }
+        buffer[1] = new byte[tfhdBodySize];
+        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+        set.position(4);
+        set.putInt(chunk.moof.traf.tfhd.trackId);
+        set.putLong(moofOffset);
+        if (hasFlag(flags, 0x08)) {
+            set.putInt(chunk.moof.traf.tfhd.defaultSampleDuration);
+        }
+        if (hasFlag(flags, 0x10)) {
+            set.putInt(chunk.moof.traf.tfhd.defaultSampleSize);
+        }
+        if (hasFlag(flags, 0x20)) {
+            set.putInt(chunk.moof.traf.tfhd.defaultSampleFlags);
+        }
+        set.putInt(0, flags);
+        ByteBuffer.wrap(buffer[0]).putInt(8, 8 + tfhdBodySize);
+
+        buffer[2] = new byte[]{
+            0x00, 0x00, 0x00, 0x14,
+            0x74, 0x66, 0x64, 0x74,
+            0x01, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00
+        };
+
+        ByteBuffer.wrap(buffer[2]).putLong(12, chunk.moof.traf.tfdt);
+
+        buffer[3] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x75, 0x6E,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00
+        };
+
+        buffer[4] = chunk.moof.traf.trun.bEntries;
+
+        lengthFor(buffer);
+
+        set = ByteBuffer.wrap(buffer[3]);
+        set.putInt(buffer[3].length + buffer[4].length);
+        set.position(8);
+        set.putInt((chunk.moof.traf.trun.bFlags | 0x01) & 0x0F01);
+        set.putInt(chunk.moof.traf.trun.entryCount);
+        extra.byteBuffer = set;
+
+        return buffer;
+    }
+
+    private byte[][] make_mdat(ArrayList<Mp4TrackChunk> chunks) {
+        byte[][] buffer = new byte[][]{
+            {
+                0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x61, 0x74
+            }
+        };
+
+        int length = 0;
+
+        for (Mp4TrackChunk chunk : chunks) {
+            length += chunk.moof.traf.trun.chunkSize;
+        }
+
+        ByteBuffer.wrap(buffer[0]).putInt(length + 8);
+
+        return buffer;
+    }
+
+    private byte[][] make_ftyp() {
+        return new byte[][]{
+            {
+                0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70, 0x64, 0x61, 0x73, 0x68, 0x00, 0x00, 0x00, 0x00,
+                0x6D, 0x70, 0x34, 0x31, 0x69, 0x73, 0x6F, 0x6D, 0x69, 0x73, 0x6F, 0x36, 0x69, 0x73, 0x6F, 0x32
+            }
+        };
+    }
+
+    private byte[][] make_mvhd() {
+        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x78, 0x6D, 0x76, 0x68, 0x64, 0x01, 0x00, 0x00, 0x00
+        };
+        buffer[1] = new byte[28];
+        buffer[2] = new byte[]{
+            0x00, 0x01, 0x00, 0x00, 0x01, 0x00,// default volume and rate
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,// reserved values
+            // default matrix
+            0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x40, 0x00, 0x00, 0x00
+        };
+        buffer[3] = new byte[24];// predefined
+        buffer[4] = ByteBuffer.allocate(4).putInt(infoTracks.length + 1).array();
+
+        long longestTrack = 0;
+
+        for (Mp4Track track : infoTracks) {
+            long tmp = (long) ((track.trak.tkhd.duration / (double) track.trak.mdia_mdhd_timeScale) * DEFAULT_TIMESCALE);
+            if (tmp > longestTrack) {
+                longestTrack = tmp;
+            }
+        }
+
+        ByteBuffer.wrap(buffer[1])
+                .putLong(time)
+                .putLong(time)
+                .putInt(DEFAULT_TIMESCALE)
+                .putLong(longestTrack);
+
+        return buffer;
+    }
+
+    private byte[][] make_trak(int trackId, Trak trak) throws RuntimeException {
+        if (trak.tkhd.matrix.length != 36) {
+            throw new RuntimeException("bad track matrix length (expected 36)");
+        }
+
+        byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B,// trak header
+            0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03 // tkhd header
+        };
+        buffer[1] = new byte[48];
+        buffer[2] = trak.tkhd.matrix;
+        buffer[3] = new byte[8];
+        buffer[4] = trak.mdia;
+
+        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+        set.putLong(time);
+        set.putLong(time);
+        set.putInt(trackId);
+        set.position(24);
+        set.putLong(trak.tkhd.duration);
+        set.position(40);
+        set.putShort(trak.tkhd.bLayer);
+        set.putShort(trak.tkhd.bAlternateGroup);
+        set.putShort(trak.tkhd.bVolume);
+
+        ByteBuffer.wrap(buffer[3])
+                .putInt(trak.tkhd.bWidth)
+                .putInt(trak.tkhd.bHeight);
+
+        return lengthFor(buffer);
+    }
+
+    private byte[][] make_moov() throws RuntimeException {
+        int pos = 1;
+        byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length) + (DIMENSIONAL_FIVE * infoTracks.length) + DIMENSIONAL_FIVE + 1][];
+
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x76
+        };
+
+        for (byte[] buff : make_mvhd()) {
+            buffer[pos++] = buff;
+        }
+
+        for (int i = 0; i < infoTracks.length; i++) {
+            for (byte[] buff : make_trak(i + 1, infoTracks[i].trak)) {
+                buffer[pos++] = buff;
+            }
+        }
+
+        buffer[pos] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x65, 0x78
+        };
+
+        ByteBuffer.wrap(buffer[pos++]).putInt((infoTracks.length * DEFAULT_TREX_SIZE) + 8);
+
+        for (int i = 0; i < infoTracks.length; i++) {
+            for (byte[] buff : make_trex(i + 1, infoTracks[i].trex)) {
+                buffer[pos++] = buff;
+            }
+        }
+
+        // default udta
+        buffer[pos] = new byte[]{
+            0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65, 0x74, 0x61,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70, 0x70, 0x6C, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
+            0x1F, (byte) 0xA9, 0x63, 0x6D, 0x74, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00,
+            0x01, 0x00, 0x00, 0x00, 0x00,
+            0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+        };
+
+        return lengthFor(buffer);
+    }
+
+    private byte[][] make_trex(int trackId, Trex trex) {
+        byte[][] buffer = new byte[][]{
+            {
+                0x00, 0x00, 0x00, 0x20, 0x74, 0x72, 0x65, 0x78, 0x00, 0x00, 0x00, 0x00
+            },
+            new byte[20]
+        };
+
+        ByteBuffer.wrap(buffer[1])
+                .putInt(trackId)
+                .putInt(trex.defaultSampleDescriptionIndex)
+                .putInt(trex.defaultSampleDuration)
+                .putInt(trex.defaultSampleSize)
+                .putInt(trex.defaultSampleFlags);
+
+        return buffer;
+    }
+
+    private byte[][] make_tfra(int trackId, List<Integer> times, List<Long> moofOffsets) {
+        int entryCount = times.size() - 1;
+        byte[][] buffer = new byte[DIMENSIONAL_TWO][];
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x72, 0x61, 0x01, 0x00, 0x00, 0x00
+        };
+        buffer[1] = new byte[12 + ((16 + TFRA_TTS_DEFAULT.length) * entryCount)];
+
+        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+        set.putInt(trackId);
+        set.position(8);
+        set.putInt(entryCount);
+
+        long decodeTime = 0;
+
+        for (int i = 0; i < entryCount; i++) {
+            decodeTime += times.get(i);
+            set.putLong(decodeTime);
+            set.putLong(moofOffsets.get(i));
+            set.put(TFRA_TTS_DEFAULT);// default values: traf number/trun number/sample number
+        }
+
+        return lengthFor(buffer);
+    }
+
+    private byte[][] make_mfra() {
+        byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length)][];
+        buffer[0] = new byte[]{
+            0x00, 0x00, 0x00, 0x00, 0x6D, 0x66, 0x72, 0x61
+        };
+        int pos = 1;
+
+        for (int i = 0; i < infoTracks.length; i++) {
+            for (byte[] buff : make_tfra(i + 1, chunkTimes.get(i), moofOffsets)) {
+                buffer[pos++] = buff;
+            }
+        }
+
+        buffer[pos] = new byte[]{// mfro
+            0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x72, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+
+        lengthFor(buffer);
+
+        ByteBuffer set = ByteBuffer.wrap(buffer[pos]);
+        set.position(12);
+        set.put(buffer[0], 0, 4);
+
+        return buffer;
+
+    }
+
+    private byte[][] make_sidx(int internalTrackId, long firstOffset) {
+        List<Integer> times = chunkTimes.get(internalTrackId);
+        int count = times.size() - 1;// the first item is ignored (composition time)
+
+        if (count > 65535) {
+            throw new OutOfMemoryError("to many fragments. sidx limit is 65535, found " + String.valueOf(count));
+        }
+
+        byte[][] buffer = new byte[][]{
+            new byte[]{
+                0x00, 0x00, 0x00, 0x00, 0x73, 0x69, 0x64, 0x78, 0x01, 0x00, 0x00, 0x00
+            },
+            new byte[calcSidxBodySize(count)]
+        };
+
+        lengthFor(buffer);
+
+        ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+        set.putInt(internalTrackId + 1);
+        set.putInt(infoTracks[internalTrackId].trak.mdia_mdhd_timeScale);
+        set.putLong(0);
+        set.putLong(firstOffset - ByteBuffer.wrap(buffer[0]).getInt());
+        set.putInt(0xFFFF & count);// unsigned
+
+        int i = 0;
+        while (i < count) {
+            set.putInt(fragSizes.get(i) & 0x7fffffff);// default reference type is 0
+            set.putInt(times.get(i + 1));
+            set.putInt(0x90000000);// default SAP settings
+            i++;
+        }
+
+        return buffer;
+    }
+
+    private byte[][] make_free(int totalSize) {
+        return lengthFor(new byte[][]{
+            new byte[]{0x00, 0x00, 0x00, 0x00, 0x66, 0x72, 0x65, 0x65},
+            new byte[totalSize - 8]// this is waste of RAM
+        });
+
+    }
+
+//</editor-fold>
+
+    class TrunExtra {
+
+        ByteBuffer byteBuffer;
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java

@@ -0,0 +1,370 @@
+package org.schabi.newpipe.streams;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.util.Locale;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * @author kapodamy
+ */
+public class SubtitleConverter {
+    private static final String NEW_LINE = "\r\n";
+
+    public void dumpTTML(SharpStream in, final SharpStream out, final boolean ignoreEmptyFrames, final boolean detectYoutubeDuplicateLines
+    ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
+        
+        final FrameWriter callback = new FrameWriter() {
+            int frameIndex = 0;
+            final Charset charset = Charset.forName("utf-8");
+            
+            @Override
+            public void yield(SubtitleFrame frame) throws IOException {
+                if (ignoreEmptyFrames && frame.isEmptyText()) {
+                    return;
+                }
+                out.write(String.valueOf(frameIndex++).getBytes(charset));
+                out.write(NEW_LINE.getBytes(charset));
+                out.write(getTime(frame.start, true).getBytes(charset));
+                out.write(" --> ".getBytes(charset));
+                out.write(getTime(frame.end, true).getBytes(charset));
+                out.write(NEW_LINE.getBytes(charset));
+                out.write(frame.text.getBytes(charset));
+                out.write(NEW_LINE.getBytes(charset));
+                out.write(NEW_LINE.getBytes(charset));
+            }
+        };
+        
+        read_xml_based(in, callback, detectYoutubeDuplicateLines,
+                "tt", "xmlns", "http://www.w3.org/ns/ttml",
+                new String[]{"timedtext", "head", "wp"},
+                new String[]{"body", "div", "p"},
+                "begin", "end", true
+        );                  
+    }
+
+    private void read_xml_based(SharpStream source, FrameWriter callback, boolean detectYoutubeDuplicateLines,
+                                String root, String formatAttr, String formatVersion, String[] cuePath, String[] framePath,
+                                String timeAttr, String durationAttr, boolean hasTimestamp
+    ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
+        /*
+         * XML based subtitles parser with BASIC support
+         * multiple CUE is not supported
+         * styling is not supported
+         * tag timestamps (in auto-generated subtitles) are not supported, maybe in the future
+         * also TimestampTagOption enum is not applicable
+         * Language parsing is not supported
+         */
+
+        byte[] buffer = new byte[source.available()];
+        source.read(buffer);
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document xml = builder.parse(new ByteArrayInputStream(buffer));
+
+        String attr;
+
+        // get the format version or namespace
+        Element node = xml.getDocumentElement();
+
+        if (node == null) {
+            throw new ParseException("Can't get the format version. ¿wrong namespace?", -1);
+        } else if (!node.getNodeName().equals(root)) {
+            throw new ParseException("Invalid root", -1);
+        }
+
+        if (formatAttr.equals("xmlns")) {
+            if (!node.getNamespaceURI().equals(formatVersion)) {
+                throw new UnsupportedOperationException("Expected xml namespace: " + formatVersion);
+            }
+        } else {
+            attr = node.getAttributeNS(formatVersion, formatAttr);
+            if (attr == null) {
+                throw new ParseException("Can't get the format attribute", -1);
+            }
+            if (!attr.equals(formatVersion)) {
+                throw new ParseException("Invalid format version : " + attr, -1);
+            }
+        }
+
+        NodeList node_list;
+
+        int line_break = 0;// Maximum characters per line if present (valid for TranScript v3)
+
+        if (!hasTimestamp) {
+            node_list = selectNodes(xml, cuePath, formatVersion);
+
+            if (node_list != null) {
+                // if the subtitle has multiple CUEs, use the highest value
+                for (int i = 0; i < node_list.getLength(); i++) {
+                    try {
+                        int tmp = Integer.parseInt(((Element) node_list.item(i)).getAttributeNS(formatVersion, "ah"));
+                        if (tmp > line_break) {
+                            line_break = tmp;
+                        }
+                    } catch (Exception err) {
+                    }
+                }
+            }
+        }
+
+        // parse every frame
+        node_list = selectNodes(xml, framePath, formatVersion);
+
+        if (node_list == null) {
+            return;// no frames detected
+        }
+
+        int fs_ff = -1;// first timestamp of first frame
+        boolean limit_lines = false;
+
+        for (int i = 0; i < node_list.getLength(); i++) {
+            Element elem = (Element) node_list.item(i);
+            SubtitleFrame obj = new SubtitleFrame();
+            obj.text = elem.getTextContent();
+
+            attr = elem.getAttribute(timeAttr);// ¡this cant be null!
+            obj.start = hasTimestamp ? parseTimestamp(attr) : Integer.parseInt(attr);
+
+            attr = elem.getAttribute(durationAttr);
+            if (obj.text == null || attr == null) {
+                continue;// normally is a blank line (on auto-generated subtitles) ignore
+            }
+
+            if (hasTimestamp) {
+                obj.end = parseTimestamp(attr);
+
+                if (detectYoutubeDuplicateLines) {
+                    if (limit_lines) {
+                        int swap = obj.end;
+                        obj.end = fs_ff;
+                        fs_ff = swap;
+                    } else {
+                        if (fs_ff < 0) {
+                            fs_ff = obj.end;
+                        } else {
+                            if (fs_ff < obj.start) {
+                                limit_lines = true;// the subtitles has duplicated lines
+                            } else {
+                                detectYoutubeDuplicateLines = false;
+                            }
+                        }
+                    }
+                }
+            } else {
+                obj.end = obj.start + Integer.parseInt(attr);
+            }
+
+            if (/*node.getAttribute("w").equals("1") &&*/line_break > 1 && obj.text.length() > line_break) {
+
+                // implement auto line breaking (once)
+                StringBuilder text = new StringBuilder(obj.text);
+                obj.text = null;
+
+                switch (text.charAt(line_break)) {
+                    case ' ':
+                    case '\t':
+                        putBreakAt(line_break, text);
+                        break;
+                    default:// find the word start position
+                        for (int j = line_break - 1; j > 0; j--) {
+                            switch (text.charAt(j)) {
+                                case ' ':
+                                case '\t':
+                                    putBreakAt(j, text);
+                                    j = -1;
+                                    break;
+                                case '\r':
+                                case '\n':
+                                    j = -1;// long word, just ignore
+                                    break;
+                            }
+                        }
+                        break;
+                }
+
+                obj.text = text.toString();// set the processed text
+            }
+
+            callback.yield(obj);
+        }
+    }
+
+    private static NodeList selectNodes(Document xml, String[] path, String namespaceUri) throws XPathExpressionException {
+        Element ref = xml.getDocumentElement();
+
+        for (int i = 0; i < path.length - 1; i++) {
+            NodeList nodes = ref.getChildNodes();
+            if (nodes.getLength() < 1) {
+                return null;
+            }
+
+            Element elem;
+            for (int j = 0; j < nodes.getLength(); j++) {
+                if (nodes.item(j).getNodeType() == Node.ELEMENT_NODE) {
+                    elem = (Element) nodes.item(j);
+                    if (elem.getNodeName().equals(path[i]) && elem.getNamespaceURI().equals(namespaceUri)) {
+                        ref = elem;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return ref.getElementsByTagNameNS(namespaceUri, path[path.length - 1]);
+    }
+
+    private static int parseTimestamp(String multiImpl) throws NumberFormatException, ParseException {
+        if (multiImpl.length() < 1) {
+            return 0;
+        } else if (multiImpl.length() == 1) {
+            return Integer.parseInt(multiImpl) * 1000;// ¡this must be a number in seconds!
+        }
+
+        // detect wallclock-time
+        if (multiImpl.startsWith("wallclock(")) {
+            throw new UnsupportedOperationException("Parsing wallclock timestamp is not implemented");
+        }
+
+        // detect offset-time
+        if (multiImpl.indexOf(':') < 0) {
+            int multiplier = 1000;
+            char metric = multiImpl.charAt(multiImpl.length() - 1);
+            switch (metric) {
+                case 'h':
+                    multiplier *= 3600000;
+                    break;
+                case 'm':
+                    multiplier *= 60000;
+                    break;
+                case 's':
+                    if (multiImpl.charAt(multiImpl.length() - 2) == 'm') {
+                        multiplier = 1;// ms
+                    }
+                    break;
+                default:
+                    if (!Character.isDigit(metric)) {
+                        throw new NumberFormatException("Invalid metric suffix found on : " + multiImpl);
+                    }
+                    metric = '\0';
+                    break;
+            }
+            try {
+                String offset_time = multiImpl;
+
+                if (multiplier == 1) {
+                    offset_time = offset_time.substring(0, offset_time.length() - 2);
+                } else if (metric != '\0') {
+                    offset_time = offset_time.substring(0, offset_time.length() - 1);
+                }
+
+                double time_metric_based = Double.parseDouble(offset_time);
+                if (Math.abs(time_metric_based) <= Double.MAX_VALUE) {
+                    return (int) (time_metric_based * multiplier);
+                }
+            } catch (Exception err) {
+                throw new UnsupportedOperationException("Invalid or not implemented timestamp on: " + multiImpl);
+            }
+        }
+
+        // detect clock-time
+        int time = 0;
+        String[] units = multiImpl.split(":");
+
+        if (units.length < 3) {
+            throw new ParseException("Invalid clock-time timestamp", -1);
+        }
+
+        time += Integer.parseInt(units[0]) * 3600000;// hours
+        time += Integer.parseInt(units[1]) * 60000;//minutes
+        time += Float.parseFloat(units[2]) * 1000f;// seconds and milliseconds (if present)
+
+        // frames and sub-frames are ignored (not implemented)
+        // time += units[3] * fps;
+        return time;
+    }
+
+    private static void putBreakAt(int idx, StringBuilder str) {
+        // this should be optimized at compile time
+
+        if (NEW_LINE.length() > 1) {
+            str.delete(idx, idx + 1);// remove after replace
+            str.insert(idx, NEW_LINE);
+        } else {
+            str.setCharAt(idx, NEW_LINE.charAt(0));
+        }
+    }
+
+    private static String getTime(int time, boolean comma) {
+        // cast every value to integer to avoid auto-round in ToString("00").
+        StringBuilder str = new StringBuilder(12);
+        str.append(numberToString(time / 1000 / 3600, 2));// hours
+        str.append(':');
+        str.append(numberToString(time / 1000 / 60 % 60, 2));// minutes
+        str.append(':');
+        str.append(numberToString(time / 1000 % 60, 2));// seconds
+        str.append(comma ? ',' : '.');
+        str.append(numberToString(time % 1000, 3));// miliseconds
+
+        return str.toString();
+    }
+
+    private static String numberToString(int nro, int pad) {
+        return String.format(Locale.ENGLISH, "%0".concat(String.valueOf(pad)).concat("d"), nro);
+    }
+
+
+    /******************
+     * helper classes *
+     ******************/
+
+    private interface FrameWriter {
+
+        void yield(SubtitleFrame frame) throws IOException;
+    }
+
+    private static class SubtitleFrame {
+        //Java no support unsigned int
+
+        public int end;
+        public int start;
+        public String text = "";
+
+        private boolean isEmptyText() {
+            if (text == null) {
+                return true;
+            }
+
+            for (int i = 0; i < text.length(); i++) {
+                switch (text.charAt(i)) {
+                    case ' ':
+                    case '\t':
+                    case '\r':
+                    case '\n':
+                        break;
+                    default:
+                        return false;
+                }
+            }
+
+            return true;
+        }
+    }
+
+}

app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java

@@ -0,0 +1,65 @@
+package org.schabi.newpipe.streams;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class TrackDataChunk extends InputStream {
+
+    private final DataReader base;
+    private int size;
+
+    public TrackDataChunk(DataReader base, int size) {
+        this.base = base;
+        this.size = size;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (size < 1) {
+            return -1;
+        }
+
+        int res = base.read();
+
+        if (res >= 0) {
+            size--;
+        }
+
+        return res;
+    }
+
+    @Override
+    public int read(byte[] buffer) throws IOException {
+        return read(buffer, 0, buffer.length);
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int count) throws IOException {
+        count = Math.min(size, count);
+        int read = base.read(buffer, offset, count);
+        size -= count;
+        return read;
+    }
+
+    @Override
+    public long skip(long amount) throws IOException {
+        long res = base.skipBytes(Math.min(amount, size));
+        size -= res;
+        return res;
+    }
+
+    @Override
+    public int available() {
+        return size;
+    }
+
+    @Override
+    public void close() {
+        size = 0;
+    }
+
+    @Override
+    public boolean markSupported() {
+        return false;
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/WebMReader.java

@@ -0,0 +1,507 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class WebMReader {
+
+    //<editor-fold defaultState="collapsed" desc="constants">
+    private final static int ID_EMBL = 0x0A45DFA3;
+    private final static int ID_EMBLReadVersion = 0x02F7;
+    private final static int ID_EMBLDocType = 0x0282;
+    private final static int ID_EMBLDocTypeReadVersion = 0x0285;
+
+    private final static int ID_Segment = 0x08538067;
+
+    private final static int ID_Info = 0x0549A966;
+    private final static int ID_TimecodeScale = 0x0AD7B1;
+    private final static int ID_Duration = 0x489;
+
+    private final static int ID_Tracks = 0x0654AE6B;
+    private final static int ID_TrackEntry = 0x2E;
+    private final static int ID_TrackNumber = 0x57;
+    private final static int ID_TrackType = 0x03;
+    private final static int ID_CodecID = 0x06;
+    private final static int ID_CodecPrivate = 0x23A2;
+    private final static int ID_Video = 0x60;
+    private final static int ID_Audio = 0x61;
+    private final static int ID_DefaultDuration = 0x3E383;
+    private final static int ID_FlagLacing = 0x1C;
+
+    private final static int ID_Cluster = 0x0F43B675;
+    private final static int ID_Timecode = 0x67;
+    private final static int ID_SimpleBlock = 0x23;
+//</editor-fold>
+
+    public enum TrackKind {
+        Audio/*2*/, Video/*1*/, Other
+    }
+
+    private DataReader stream;
+    private Segment segment;
+    private WebMTrack[] tracks;
+    private int selectedTrack;
+    private boolean done;
+    private boolean firstSegment;
+
+    public WebMReader(SharpStream source) {
+        this.stream = new DataReader(source);
+    }
+
+    public void parse() throws IOException {
+        Element elem = readElement(ID_EMBL);
+        if (!readEbml(elem, 1, 2)) {
+            throw new UnsupportedOperationException("Unsupported EBML data (WebM)");
+        }
+        ensure(elem);
+
+        elem = untilElement(null, ID_Segment);
+        if (elem == null) {
+            throw new IOException("Fragment element not found");
+        }
+        segment = readSegment(elem, 0, true);
+        tracks = segment.tracks;
+        selectedTrack = -1;
+        done = false;
+        firstSegment = true;
+    }
+
+    public WebMTrack[] getAvailableTracks() {
+        return tracks;
+    }
+
+    public WebMTrack selectTrack(int index) {
+        selectedTrack = index;
+        return tracks[index];
+    }
+
+    public Segment getNextSegment() throws IOException {
+        if (done) {
+            return null;
+        }
+
+        if (firstSegment && segment != null) {
+            firstSegment = false;
+            return segment;
+        }
+
+        ensure(segment.ref);
+
+        Element elem = untilElement(null, ID_Segment);
+        if (elem == null) {
+            done = true;
+            return null;
+        }
+        segment = readSegment(elem, 0, false);
+
+        return segment;
+    }
+
+    //<editor-fold defaultstate="collapsed" desc="utils">
+    private long readNumber(Element parent) throws IOException {
+        int length = (int) parent.contentSize;
+        long value = 0;
+        while (length-- > 0) {
+            int read = stream.read();
+            if (read == -1) {
+                throw new EOFException();
+            }
+            value = (value << 8) | read;
+        }
+        return value;
+    }
+
+    private String readString(Element parent) throws IOException {
+        return new String(readBlob(parent), "utf-8");
+    }
+
+    private byte[] readBlob(Element parent) throws IOException {
+        long length = parent.contentSize;
+        byte[] buffer = new byte[(int) length];
+        int read = stream.read(buffer);
+        if (read < length) {
+            throw new EOFException();
+        }
+        return buffer;
+    }
+
+    private long readEncodedNumber() throws IOException {
+        int value = stream.read();
+
+        if (value > 0) {
+            byte size = 1;
+            int mask = 0x80;
+
+            while (size < 9) {
+                if ((value & mask) == mask) {
+                    mask = 0xFF;
+                    mask >>= size;
+
+                    long number = value & mask;
+
+                    for (int i = 1; i < size; i++) {
+                        value = stream.read();
+                        number <<= 8;
+                        number |= value;
+                    }
+
+                    return number;
+                }
+
+                mask >>= 1;
+                size++;
+            }
+        }
+
+        throw new IOException("Invalid encoded length");
+    }
+
+    private Element readElement() throws IOException {
+        Element elem = new Element();
+        elem.offset = stream.position();
+        elem.type = (int) readEncodedNumber();
+        elem.contentSize = readEncodedNumber();
+        elem.size = elem.contentSize + stream.position() - elem.offset;
+
+        return elem;
+    }
+
+    private Element readElement(int expected) throws IOException {
+        Element elem = readElement();
+        if (expected != 0 && elem.type != expected) {
+            throw new NoSuchElementException("expected " + elementID(expected) + " found " + elementID(elem.type));
+        }
+
+        return elem;
+    }
+
+    private Element untilElement(Element ref, int... expected) throws IOException {
+        Element elem;
+        while (ref == null ? stream.available() : (stream.position() < (ref.offset + ref.size))) {
+            elem = readElement();
+            for (int type : expected) {
+                if (elem.type == type) {
+                    return elem;
+                }
+            }
+            ensure(elem);
+        }
+
+        return null;
+    }
+
+    private String elementID(long type) {
+        return "0x".concat(Long.toHexString(type));
+    }
+
+    private void ensure(Element ref) throws IOException {
+        long skip = (ref.offset + ref.size) - stream.position();
+
+        if (skip == 0) {
+            return;
+        } else if (skip < 0) {
+            throw new EOFException(String.format(
+                    "parser go beyond limits of the Element. type=%s offset=%s size=%s position=%s",
+                    elementID(ref.type), ref.offset, ref.size, stream.position()
+            ));
+        }
+
+        stream.skipBytes(skip);
+    }
+//</editor-fold>
+
+    //<editor-fold defaultState="collapsed" desc="elements readers">
+    private boolean readEbml(Element ref, int minReadVersion, int minDocTypeVersion) throws IOException {
+        Element elem = untilElement(ref, ID_EMBLReadVersion);
+        if (elem == null) {
+            return false;
+        }
+        if (readNumber(elem) > minReadVersion) {
+            return false;
+        }
+
+        elem = untilElement(ref, ID_EMBLDocType);
+        if (elem == null) {
+            return false;
+        }
+        if (!readString(elem).equals("webm")) {
+            return false;
+        }
+        elem = untilElement(ref, ID_EMBLDocTypeReadVersion);
+
+        return elem != null && readNumber(elem) <= minDocTypeVersion;
+    }
+
+    private Info readInfo(Element ref) throws IOException {
+        Element elem;
+        Info info = new Info();
+
+        while ((elem = untilElement(ref, ID_TimecodeScale, ID_Duration)) != null) {
+            switch (elem.type) {
+                case ID_TimecodeScale:
+                    info.timecodeScale = readNumber(elem);
+                    break;
+                case ID_Duration:
+                    info.duration = readNumber(elem);
+                    break;
+            }
+            ensure(elem);
+        }
+
+        if (info.timecodeScale == 0) {
+            throw new NoSuchElementException("Element Timecode not found");
+        }
+
+        return info;
+    }
+
+    private Segment readSegment(Element ref, int trackLacingExpected, boolean metadataExpected) throws IOException {
+        Segment obj = new Segment(ref);
+        Element elem;
+        while ((elem = untilElement(ref, ID_Info, ID_Tracks, ID_Cluster)) != null) {
+            if (elem.type == ID_Cluster) {
+                obj.currentCluster = elem;
+                break;
+            }
+            switch (elem.type) {
+                case ID_Info:
+                    obj.info = readInfo(elem);
+                    break;
+                case ID_Tracks:
+                    obj.tracks = readTracks(elem, trackLacingExpected);
+                    break;
+            }
+            ensure(elem);
+        }
+
+        if (metadataExpected && (obj.info == null || obj.tracks == null)) {
+            throw new RuntimeException("Cluster element found without Info and/or Tracks element at position " + String.valueOf(ref.offset));
+        }
+
+        return obj;
+    }
+
+    private WebMTrack[] readTracks(Element ref, int lacingExpected) throws IOException {
+        ArrayList<WebMTrack> trackEntries = new ArrayList<>(2);
+        Element elem_trackEntry;
+
+        while ((elem_trackEntry = untilElement(ref, ID_TrackEntry)) != null) {
+            WebMTrack entry = new WebMTrack();
+            boolean drop = false;
+            Element elem;
+            while ((elem = untilElement(elem_trackEntry,
+                    ID_TrackNumber, ID_TrackType, ID_CodecID, ID_CodecPrivate, ID_FlagLacing, ID_DefaultDuration, ID_Audio, ID_Video
+            )) != null) {
+                switch (elem.type) {
+                    case ID_TrackNumber:
+                        entry.trackNumber = readNumber(elem);
+                        break;
+                    case ID_TrackType:
+                        entry.trackType = (int)readNumber(elem);
+                        break;
+                    case ID_CodecID:
+                        entry.codecId = readString(elem);
+                        break;
+                    case ID_CodecPrivate:
+                        entry.codecPrivate = readBlob(elem);
+                        break;
+                    case ID_Audio:
+                    case ID_Video:
+                        entry.bMetadata = readBlob(elem);
+                        break;
+                    case ID_DefaultDuration:
+                        entry.defaultDuration = readNumber(elem);
+                        break;
+                    case ID_FlagLacing:
+                        drop = readNumber(elem) != lacingExpected;
+                        break;
+                    default:
+                        System.out.println();
+                        break;
+                }
+                ensure(elem);
+            }
+            if (!drop) {
+                trackEntries.add(entry);
+            }
+            ensure(elem_trackEntry);
+        }
+
+        WebMTrack[] entries = new WebMTrack[trackEntries.size()];
+        trackEntries.toArray(entries);
+
+        for (WebMTrack entry : entries) {
+            switch (entry.trackType) {
+                case 1:
+                    entry.kind = TrackKind.Video;
+                    break;
+                case 2:
+                    entry.kind = TrackKind.Audio;
+                    break;
+                default:
+                    entry.kind = TrackKind.Other;
+                    break;
+            }
+        }
+
+        return entries;
+    }
+
+    private SimpleBlock readSimpleBlock(Element ref) throws IOException {
+        SimpleBlock obj = new SimpleBlock(ref);
+        obj.dataSize = stream.position();
+        obj.trackNumber = readEncodedNumber();
+        obj.relativeTimeCode = stream.readShort();
+        obj.flags = (byte) stream.read();
+        obj.dataSize = (ref.offset + ref.size) - stream.position();
+
+        if (obj.dataSize < 0) {
+            throw new IOException(String.format("Unexpected SimpleBlock element size, missing %s bytes", -obj.dataSize));
+        }
+        return obj;
+    }
+
+    private Cluster readCluster(Element ref) throws IOException {
+        Cluster obj = new Cluster(ref);
+
+        Element elem = untilElement(ref, ID_Timecode);
+        if (elem == null) {
+            throw new NoSuchElementException("Cluster at " + String.valueOf(ref.offset) + " without Timecode element");
+        }
+        obj.timecode = readNumber(elem);
+
+        return obj;
+    }
+//</editor-fold>
+
+    //<editor-fold defaultstate="collapsed" desc="class helpers">
+    class Element {
+
+        int type;
+        long offset;
+        long contentSize;
+        long size;
+    }
+
+    public class Info {
+
+        public long timecodeScale;
+        public long duration;
+    }
+
+    public class WebMTrack {
+
+        public long trackNumber;
+        protected int trackType;
+        public String codecId;
+        public byte[] codecPrivate;
+        public byte[] bMetadata;
+        public TrackKind kind;
+        public long defaultDuration;
+    }
+
+    public class Segment {
+
+        Segment(Element ref) {
+            this.ref = ref;
+            this.firstClusterInSegment = true;
+        }
+
+        public Info info;
+        WebMTrack[] tracks;
+        private Element currentCluster;
+        private final Element ref;
+        boolean firstClusterInSegment;
+
+        public Cluster getNextCluster() throws IOException {
+            if (done) {
+                return null;
+            }
+            if (firstClusterInSegment && segment.currentCluster != null) {
+                firstClusterInSegment = false;
+                return readCluster(segment.currentCluster);
+            }
+            ensure(segment.currentCluster);
+
+            Element elem = untilElement(segment.ref, ID_Cluster);
+            if (elem == null) {
+                return null;
+            }
+
+            segment.currentCluster = elem;
+
+            return readCluster(segment.currentCluster);
+        }
+    }
+
+    public class SimpleBlock {
+
+        public TrackDataChunk data;
+
+        SimpleBlock(Element ref) {
+            this.ref = ref;
+        }
+
+        public long trackNumber;
+        public short relativeTimeCode;
+        public byte flags;
+        public long dataSize;
+        private final Element ref;
+
+        public boolean isKeyframe() {
+            return (flags & 0x80) == 0x80;
+        }
+    }
+
+    public class Cluster {
+
+        Element ref;
+        SimpleBlock currentSimpleBlock = null;
+        public long timecode;
+
+        Cluster(Element ref) {
+            this.ref = ref;
+        }
+
+        boolean check() {
+            return stream.position() >= (ref.offset + ref.size);
+        }
+
+        public SimpleBlock getNextSimpleBlock() throws IOException {
+            if (check()) {
+                return null;
+            }
+            if (currentSimpleBlock != null) {
+                ensure(currentSimpleBlock.ref);
+            }
+
+            while (!check()) {
+                Element elem = untilElement(ref, ID_SimpleBlock);
+                if (elem == null) {
+                    return null;
+                }
+
+                currentSimpleBlock = readSimpleBlock(elem);
+                if (currentSimpleBlock.trackNumber == tracks[selectedTrack].trackNumber) {
+                    currentSimpleBlock.data = new TrackDataChunk(stream, (int) currentSimpleBlock.dataSize);
+                    return currentSimpleBlock;
+                }
+
+                ensure(elem);
+            }
+
+            return null;
+        }
+
+    }
+//</editor-fold>
+}

app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java

@@ -0,0 +1,728 @@
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.WebMReader.Cluster;
+import org.schabi.newpipe.streams.WebMReader.Segment;
+import org.schabi.newpipe.streams.WebMReader.SimpleBlock;
+import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class WebMWriter {
+
+    private final static int BUFFER_SIZE = 8 * 1024;
+    private final static int DEFAULT_TIMECODE_SCALE = 1000000;
+    private final static int INTERV = 100;// 100ms on 1000000us timecode scale
+    private final static int DEFAULT_CUES_EACH_MS = 5000;// 100ms on 1000000us timecode scale
+
+    private WebMReader.WebMTrack[] infoTracks;
+    private SharpStream[] sourceTracks;
+
+    private WebMReader[] readers;
+
+    private boolean done = false;
+    private boolean parsed = false;
+
+    private long written = 0;
+
+    private Segment[] readersSegment;
+    private Cluster[] readersCluter;
+
+    private int[] predefinedDurations;
+
+    private byte[] outBuffer;
+
+    public WebMWriter(SharpStream... source) {
+        sourceTracks = source;
+        readers = new WebMReader[sourceTracks.length];
+        infoTracks = new WebMTrack[sourceTracks.length];
+        outBuffer = new byte[BUFFER_SIZE];
+    }
+
+    public WebMTrack[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
+        if (done) {
+            throw new IllegalStateException("already done");
+        }
+        if (!parsed) {
+            throw new IllegalStateException("All sources must be parsed first");
+        }
+
+        return readers[sourceIndex].getAvailableTracks();
+    }
+
+    public void parseSources() throws IOException, IllegalStateException {
+        if (done) {
+            throw new IllegalStateException("already done");
+        }
+        if (parsed) {
+            throw new IllegalStateException("already parsed");
+        }
+
+        try {
+            for (int i = 0; i < readers.length; i++) {
+                readers[i] = new WebMReader(sourceTracks[i]);
+                readers[i].parse();
+            }
+
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public void selectTracks(int... trackIndex) throws IOException {
+        try {
+            readersSegment = new Segment[readers.length];
+            readersCluter = new Cluster[readers.length];
+            predefinedDurations = new int[readers.length];
+
+            for (int i = 0; i < readers.length; i++) {
+                infoTracks[i] = readers[i].selectTrack(trackIndex[i]);
+                predefinedDurations[i] = -1;
+                readersSegment[i] = readers[i].getNextSegment();
+            }
+        } finally {
+            parsed = true;
+        }
+    }
+
+    public long getBytesWritten() {
+        return written;
+    }
+
+    public boolean isDone() {
+        return done;
+    }
+
+    public boolean isParsed() {
+        return parsed;
+    }
+
+    public void close() {
+        done = true;
+        parsed = true;
+
+        for (SharpStream src : sourceTracks) {
+            src.dispose();
+        }
+
+        sourceTracks = null;
+        readers = null;
+        infoTracks = null;
+        readersSegment = null;
+        readersCluter = null;
+        outBuffer = null;
+    }
+
+    public void build(SharpStream out) throws IOException, RuntimeException {
+        if (!out.canRewind()) {
+            throw new IOException("The output stream must be allow seek");
+        }
+
+        makeEBML(out);
+
+        long offsetSegmentSizeSet = written + 5;
+        long offsetInfoDurationSet = written + 94;
+        long offsetClusterSet = written + 58;
+        long offsetCuesSet = written + 75;
+
+        ArrayList<byte[]> listBuffer = new ArrayList<>(4);
+
+        /* segment */
+        listBuffer.add(new byte[]{
+            0x18, 0x53, (byte) 0x80, 0x67, 0x01,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00// segment content size
+        });
+
+        long baseSegmentOffset = written + listBuffer.get(0).length;
+
+        /* seek head */
+        listBuffer.add(new byte[]{
+            0x11, 0x4d, (byte) 0x9b, 0x74, (byte) 0xbe,
+            0x4d, (byte) 0xbb, (byte) 0x8b,
+            0x53, (byte) 0xab, (byte) 0x84, 0x15, 0x49, (byte) 0xa9, 0x66, 0x53,
+            (byte) 0xac, (byte) 0x81, /*info offset*/ 0x43,
+            0x4d, (byte) 0xbb, (byte) 0x8b, 0x53, (byte) 0xab,
+            (byte) 0x84, 0x16, 0x54, (byte) 0xae, 0x6b, 0x53, (byte) 0xac, (byte) 0x81,
+            /*tracks offset*/ 0x6a,
+            0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1f,
+            0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84, /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
+            0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1c, 0x53,
+            (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84, /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
+        });
+
+        /* info */
+        listBuffer.add(new byte[]{
+            0x15, 0x49, (byte) 0xa9, 0x66, (byte) 0xa2, 0x2a, (byte) 0xd7, (byte) 0xb1
+        });
+        listBuffer.add(encode(DEFAULT_TIMECODE_SCALE, true));// this value MUST NOT exceed 4 bytes
+        listBuffer.add(new byte[]{0x44, (byte) 0x89, (byte) 0x84,
+            0x00, 0x00, 0x00, 0x00,// info.duration
+            
+            /* MuxingApp */
+            0x4d, (byte) 0x80, (byte) 0x87, 0x4E, 
+            0x65, 0x77, 0x50, 0x69, 0x70, 0x65, // "NewPipe" binary string
+            
+            /* WritingApp */ 
+            0x57, 0x41, (byte) 0x87, 0x4E, 
+            0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+        });
+
+        /* tracks */
+        listBuffer.addAll(makeTracks());
+
+        for (byte[] buff : listBuffer) {
+            dump(buff, out);
+        }
+
+        // reserve space for Cues element, but is a waste of space (actually is 64 KiB)
+        // TODO: better Cue maker
+        long cueReservedOffset = written;
+        dump(new byte[]{(byte) 0xec, 0x20, (byte) 0xff, (byte) 0xfb}, out);
+        int reserved = (1024 * 63) - 4;
+        while (reserved > 0) {
+            int write = Math.min(reserved, outBuffer.length);
+            out.write(outBuffer, 0, write);
+            reserved -= write;
+            written += write;
+        }
+
+        // Select a track for the cue
+        int cuesForTrackId = selectTrackForCue();
+        long nextCueTime = infoTracks[cuesForTrackId].trackType == 1 ? -1 : 0;
+        ArrayList<KeyFrame> keyFrames = new ArrayList<>(32);
+
+        //ArrayList<Block> chunks = new ArrayList<>(readers.length);
+        ArrayList<Long> clusterOffsets = new ArrayList<>(32);
+        ArrayList<Integer> clusterSizes = new ArrayList<>(32);
+
+        long duration = 0;
+        int durationFromTrackId = 0;
+
+        byte[] bTimecode = makeTimecode(0);
+
+        int firstClusterOffset = (int) written;
+        long currentClusterOffset = makeCluster(out, bTimecode, 0, clusterOffsets, clusterSizes);
+
+        long baseTimecode = 0;
+        long limitTimecode = -1;
+        int limitTimecodeByTrackId = cuesForTrackId;
+
+        int blockWritten = Integer.MAX_VALUE;
+
+        int newClusterByTrackId = -1;
+
+        while (blockWritten > 0) {
+            blockWritten = 0;
+            int i = 0;
+            while (i < readers.length) {
+                Block bloq = getNextBlockFrom(i);
+                if (bloq == null) {
+                    i++;
+                    continue;
+                }
+
+                if (bloq.data == null) {
+                    blockWritten = 1;// fake block
+                    newClusterByTrackId = i;
+                    i++;
+                    continue;
+                }
+
+                if (newClusterByTrackId == i) {
+                    limitTimecodeByTrackId = i;
+                    newClusterByTrackId = -1;
+                    baseTimecode = bloq.absoluteTimecode;
+                    limitTimecode = baseTimecode + INTERV;
+                    bTimecode = makeTimecode(baseTimecode);
+                    currentClusterOffset = makeCluster(out, bTimecode, currentClusterOffset, clusterOffsets, clusterSizes);
+                }
+
+                if (cuesForTrackId == i) {
+                    if ((nextCueTime > -1 && bloq.absoluteTimecode >= nextCueTime) || (nextCueTime < 0 && bloq.isKeyframe())) {
+                        if (nextCueTime > -1) {
+                            nextCueTime += DEFAULT_CUES_EACH_MS;
+                        }
+                        keyFrames.add(
+                                new KeyFrame(baseSegmentOffset, currentClusterOffset - 7, written, bTimecode.length, bloq.absoluteTimecode)
+                        );
+                    }
+                }
+
+                writeBlock(out, bloq, baseTimecode);
+                blockWritten++;
+
+                if (bloq.absoluteTimecode > duration) {
+                    duration = bloq.absoluteTimecode;
+                    durationFromTrackId = bloq.trackNumber;
+                }
+
+                if (limitTimecode < 0) {
+                    limitTimecode = bloq.absoluteTimecode + INTERV;
+                    continue;
+                }
+
+                if (bloq.absoluteTimecode >= limitTimecode) {
+                    if (limitTimecodeByTrackId != i) {
+                        limitTimecode += INTERV - (bloq.absoluteTimecode - limitTimecode);
+                    }
+                    i++;
+                }
+            }
+        }
+
+        makeCluster(out, null, currentClusterOffset, null, clusterSizes);
+
+        long segmentSize = written - offsetSegmentSizeSet - 7;
+
+        // final step write offsets and sizes
+        out.rewind();
+        written = 0;
+
+        skipTo(out, offsetSegmentSizeSet);
+        writeLong(out, segmentSize);
+
+        if (predefinedDurations[durationFromTrackId] > -1) {
+            duration += predefinedDurations[durationFromTrackId];// this value is full-filled in makeTrackEntry() method
+        }
+        skipTo(out, offsetInfoDurationSet);
+        writeFloat(out, duration);
+
+        firstClusterOffset -= baseSegmentOffset;
+        skipTo(out, offsetClusterSet);
+        writeInt(out, firstClusterOffset);
+
+        skipTo(out, cueReservedOffset);
+
+        /* Cue */
+        dump(new byte[]{0x1c, 0x53, (byte) 0xbb, 0x6b, 0x20, 0x00, 0x00}, out);
+
+        for (KeyFrame keyFrame : keyFrames) {
+            for (byte[] buffer : makeCuePoint(cuesForTrackId, keyFrame)) {
+                dump(buffer, out);
+                if (written >= (cueReservedOffset + 65535 - 16)) {
+                    throw new IOException("Too many Cues");
+                }
+            }
+        }
+        short cueSize = (short) (written - cueReservedOffset - 7);
+
+        /*  EBML Void */
+        ByteBuffer voidBuffer = ByteBuffer.allocate(4);
+        voidBuffer.putShort((short) 0xec20);
+        voidBuffer.putShort((short) (firstClusterOffset - written - 4));
+        dump(voidBuffer.array(), out);
+
+        out.rewind();
+        written = 0;
+
+        skipTo(out, offsetCuesSet);
+        writeInt(out, (int) (cueReservedOffset - baseSegmentOffset));
+
+        skipTo(out, cueReservedOffset + 5);
+        writeShort(out, cueSize);
+
+        for (int i = 0; i < clusterSizes.size(); i++) {
+            skipTo(out, clusterOffsets.get(i));
+            byte[] size = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x200000).array();
+            out.write(size, 1, 3);
+            written += 3;
+        }
+    }
+
+    private Block getNextBlockFrom(int internalTrackId) throws IOException {
+        if (readersSegment[internalTrackId] == null) {
+            readersSegment[internalTrackId] = readers[internalTrackId].getNextSegment();
+            if (readersSegment[internalTrackId] == null) {
+                return null;// no more blocks in the selected track
+            }
+        }
+
+        if (readersCluter[internalTrackId] == null) {
+            readersCluter[internalTrackId] = readersSegment[internalTrackId].getNextCluster();
+            if (readersCluter[internalTrackId] == null) {
+                readersSegment[internalTrackId] = null;
+                return getNextBlockFrom(internalTrackId);
+            }
+        }
+
+        SimpleBlock res = readersCluter[internalTrackId].getNextSimpleBlock();
+        if (res == null) {
+            readersCluter[internalTrackId] = null;
+            return new Block();// fake block to indicate the end of the cluster
+        }
+
+        Block bloq = new Block();
+        bloq.data = res.data;
+        bloq.dataSize = (int) res.dataSize;
+        bloq.trackNumber = internalTrackId;
+        bloq.flags = res.flags;
+        bloq.absoluteTimecode = convertTimecode(res.relativeTimeCode, readersSegment[internalTrackId].info.timecodeScale, DEFAULT_TIMECODE_SCALE);
+        bloq.absoluteTimecode += readersCluter[internalTrackId].timecode;
+
+        return bloq;
+    }
+
+    private short convertTimecode(int time, long oldTimeScale, int newTimeScale) {
+        return (short) (time * (newTimeScale / oldTimeScale));
+    }
+
+    private void skipTo(SharpStream stream, long absoluteOffset) throws IOException {
+        absoluteOffset -= written;
+        written += absoluteOffset;
+        stream.skip(absoluteOffset);
+    }
+
+    private void writeLong(SharpStream stream, long number) throws IOException {
+        byte[] buffer = ByteBuffer.allocate(DataReader.LONG_SIZE).putLong(number).array();
+        stream.write(buffer, 1, buffer.length - 1);
+        written += buffer.length - 1;
+    }
+
+    private void writeFloat(SharpStream stream, float number) throws IOException {
+        byte[] buffer = ByteBuffer.allocate(DataReader.FLOAT_SIZE).putFloat(number).array();
+        dump(buffer, stream);
+    }
+
+    private void writeShort(SharpStream stream, short number) throws IOException {
+        byte[] buffer = ByteBuffer.allocate(DataReader.SHORT_SIZE).putShort(number).array();
+        dump(buffer, stream);
+    }
+
+    private void writeInt(SharpStream stream, int number) throws IOException {
+        byte[] buffer = ByteBuffer.allocate(DataReader.INTEGER_SIZE).putInt(number).array();
+        dump(buffer, stream);
+    }
+
+    private void writeBlock(SharpStream stream, Block bloq, long clusterTimecode) throws IOException {
+        long relativeTimeCode = bloq.absoluteTimecode - clusterTimecode;
+
+        if (relativeTimeCode < Short.MIN_VALUE || relativeTimeCode > Short.MAX_VALUE) {
+            throw new IndexOutOfBoundsException("SimpleBlock timecode overflow.");
+        }
+
+        ArrayList<byte[]> listBuffer = new ArrayList<>(5);
+        listBuffer.add(new byte[]{(byte) 0xa3});
+        listBuffer.add(null);// block size
+        listBuffer.add(encode(bloq.trackNumber + 1, false));
+        listBuffer.add(ByteBuffer.allocate(DataReader.SHORT_SIZE).putShort((short) relativeTimeCode).array());
+        listBuffer.add(new byte[]{bloq.flags});
+
+        int blockSize = bloq.dataSize;
+        for (int i = 2; i < listBuffer.size(); i++) {
+            blockSize += listBuffer.get(i).length;
+        }
+        listBuffer.set(1, encode(blockSize, false));
+
+        for (byte[] buff : listBuffer) {
+            dump(buff, stream);
+        }
+
+        int read;
+        while ((read = bloq.data.read(outBuffer)) > 0) {
+            stream.write(outBuffer, 0, read);
+            written += read;
+        }
+    }
+
+    private byte[] makeTimecode(long timecode) {
+        ByteBuffer buffer = ByteBuffer.allocate(9);
+        buffer.put((byte) 0xe7);
+        buffer.put(encode(timecode, true));
+
+        byte[] res = new byte[buffer.position()];
+        System.arraycopy(buffer.array(), 0, res, 0, res.length);
+
+        return res;
+    }
+
+    private long makeCluster(SharpStream stream, byte[] bTimecode, long startOffset, ArrayList<Long> clusterOffsets, ArrayList<Integer> clusterSizes) throws IOException {
+        if (startOffset > 0) {
+            clusterSizes.add((int) (written - startOffset));// size for last offset
+        }
+
+        if (clusterOffsets != null) {
+            /* cluster */
+            dump(new byte[]{0x1f, 0x43, (byte) 0xb6, 0x75}, stream);
+            clusterOffsets.add(written);// warning: max cluster size is 256 MiB
+            dump(new byte[]{0x20, 0x00, 0x00}, stream);
+
+            startOffset = written;// size for the this cluster
+
+            dump(bTimecode, stream);
+
+            return startOffset;
+        }
+
+        return -1;
+    }
+
+    private void makeEBML(SharpStream stream) throws IOException {
+        // deafult values
+        dump(new byte[]{
+            0x1A, 0x45, (byte) 0xDF, (byte) 0xA3, 0x01, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x1F, 0x42, (byte) 0x86, (byte) 0x81, 0x01,
+            0x42, (byte) 0xF7, (byte) 0x81, 0x01, 0x42, (byte) 0xF2, (byte) 0x81, 0x04,
+            0x42, (byte) 0xF3, (byte) 0x81, 0x08, 0x42, (byte) 0x82, (byte) 0x84, 0x77,
+            0x65, 0x62, 0x6D, 0x42, (byte) 0x87, (byte) 0x81, 0x02,
+            0x42, (byte) 0x85, (byte) 0x81, 0x02
+        }, stream);
+    }
+
+    private ArrayList<byte[]> makeTracks() {
+        ArrayList<byte[]> buffer = new ArrayList<>(1);
+        buffer.add(new byte[]{0x16, 0x54, (byte) 0xae, 0x6b});
+        buffer.add(null);
+
+        for (int i = 0; i < infoTracks.length; i++) {
+            buffer.addAll(makeTrackEntry(i, infoTracks[i]));
+        }
+
+        return lengthFor(buffer);
+    }
+
+    private ArrayList<byte[]> makeTrackEntry(int internalTrackId, WebMTrack track) {
+        byte[] id = encode(internalTrackId + 1, true);
+        ArrayList<byte[]> buffer = new ArrayList<>(12);
+
+        /* track */
+        buffer.add(new byte[]{(byte) 0xae});
+        buffer.add(null);
+
+        /* track number */
+        buffer.add(new byte[]{(byte) 0xd7});
+        buffer.add(id);
+
+        /* track uid */
+        buffer.add(new byte[]{0x73, (byte) 0xc5});
+        buffer.add(id);
+
+        /* flag lacing */
+        buffer.add(new byte[]{(byte) 0x9c, (byte) 0x81, 0x00});
+
+        /* lang */
+        buffer.add(new byte[]{0x22, (byte) 0xb5, (byte) 0x9c, (byte) 0x83, 0x75, 0x6e, 0x64});
+
+        /* codec id */
+        buffer.add(new byte[]{(byte) 0x86});
+        buffer.addAll(encode(track.codecId));
+
+        /* type */
+        buffer.add(new byte[]{(byte) 0x83});
+        buffer.add(encode(track.trackType, true));
+
+        /* default duration */
+        if (track.defaultDuration != 0) {
+            predefinedDurations[internalTrackId] = (int) Math.ceil(track.defaultDuration / (float) DEFAULT_TIMECODE_SCALE);
+            buffer.add(new byte[]{0x23, (byte) 0xe3, (byte) 0x83});
+            buffer.add(encode(track.defaultDuration, true));
+        }
+
+        /* audio/video */
+        if ((track.trackType == 1 || track.trackType == 2) && valid(track.bMetadata)) {
+            buffer.add(new byte[]{(byte) (track.trackType == 1 ? 0xe0 : 0xe1)});
+            buffer.add(encode(track.bMetadata.length, false));
+            buffer.add(track.bMetadata);
+        }
+
+        /* codec private*/
+        if (valid(track.codecPrivate)) {
+            buffer.add(new byte[]{0x63, (byte) 0xa2});
+            buffer.add(encode(track.codecPrivate.length, false));
+            buffer.add(track.codecPrivate);
+        }
+
+        return lengthFor(buffer);
+
+    }
+
+    private ArrayList<byte[]> makeCuePoint(int internalTrackId, KeyFrame keyFrame) {
+        ArrayList<byte[]> buffer = new ArrayList<>(5);
+
+        /* CuePoint */
+        buffer.add(new byte[]{(byte) 0xbb});
+        buffer.add(null);
+
+        /* CueTime */
+        buffer.add(new byte[]{(byte) 0xb3});
+        buffer.add(encode(keyFrame.atTimecode, true));
+
+        /* CueTrackPosition */
+        buffer.addAll(makeCueTrackPosition(internalTrackId, keyFrame));
+
+        return lengthFor(buffer);
+    }
+
+    private ArrayList<byte[]> makeCueTrackPosition(int internalTrackId, KeyFrame keyFrame) {
+        ArrayList<byte[]> buffer = new ArrayList<>(8);
+
+        /* CueTrackPositions */
+        buffer.add(new byte[]{(byte) 0xb7});
+        buffer.add(null);
+
+        /* CueTrack */
+        buffer.add(new byte[]{(byte) 0xf7});
+        buffer.add(encode(internalTrackId + 1, true));
+
+        /* CueClusterPosition */
+        buffer.add(new byte[]{(byte) 0xf1});
+        buffer.add(encode(keyFrame.atCluster, true));
+
+        /* CueRelativePosition */
+        if (keyFrame.atBlock > 0) {
+            buffer.add(new byte[]{(byte) 0xf0});
+            buffer.add(encode(keyFrame.atBlock, true));
+        }
+
+        return lengthFor(buffer);
+    }
+
+    private void dump(byte[] buffer, SharpStream stream) throws IOException {
+        stream.write(buffer);
+        written += buffer.length;
+    }
+
+    private ArrayList<byte[]> lengthFor(ArrayList<byte[]> buffer) {
+        long size = 0;
+        for (int i = 2; i < buffer.size(); i++) {
+            size += buffer.get(i).length;
+        }
+        buffer.set(1, encode(size, false));
+        return buffer;
+    }
+
+    private byte[] encode(long number, boolean withLength) {
+        int length = -1;
+        for (int i = 1; i <= 7; i++) {
+            if (number < Math.pow(2, 7 * i)) {
+                length = i;
+                break;
+            }
+        }
+
+        if (length < 1) {
+            throw new ArithmeticException("Can't encode a number of bigger than 7 bytes");
+        }
+
+        if (number == (Math.pow(2, 7 * length)) - 1) {
+            length++;
+        }
+
+        int offset = withLength ? 1 : 0;
+        byte[] buffer = new byte[offset + length];
+        long marker = (long) Math.floor((length - 1) / 8);
+
+        for (int i = length - 1, mul = 1; i >= 0; i--, mul *= 0x100) {
+            long b = (long) Math.floor(number / mul);
+            if (!withLength && i == marker) {
+                b = b | (0x80 >> (length - 1));
+            }
+            buffer[offset + i] = (byte) b;
+        }
+
+        if (withLength) {
+            buffer[0] = (byte) (0x80 | length);
+        }
+
+        return buffer;
+    }
+
+    private ArrayList<byte[]> encode(String value) {
+        byte[] str;
+        try {
+            str = value.getBytes("utf-8");
+        } catch (UnsupportedEncodingException err) {
+            str = value.getBytes();
+        }
+
+        ArrayList<byte[]> buffer = new ArrayList<>(2);
+        buffer.add(encode(str.length, false));
+        buffer.add(str);
+
+        return buffer;
+    }
+
+    private boolean valid(byte[] buffer) {
+        return buffer != null && buffer.length > 0;
+    }
+
+    private int selectTrackForCue() {
+        int i = 0;
+        int videoTracks = 0;
+        int audioTracks = 0;
+
+        for (; i < infoTracks.length; i++) {
+            switch (infoTracks[i].trackType) {
+                case 1:
+                    videoTracks++;
+                    break;
+                case 2:
+                    audioTracks++;
+                    break;
+            }
+        }
+
+        int kind;
+        if (audioTracks == infoTracks.length) {
+            kind = 2;
+        } else if (videoTracks == infoTracks.length) {
+            kind = 1;
+        } else if (videoTracks > 0) {
+            kind = 1;
+        } else if (audioTracks > 0) {
+            kind = 2;
+        } else {
+            return 0;
+        }
+
+        // TODO: in the adove code, find and select the shortest track for the desired kind
+        for (i = 0; i < infoTracks.length; i++) {
+            if (kind == infoTracks[i].trackType) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    class KeyFrame {
+
+        KeyFrame(long segment, long cluster, long block, int bTimecodeLength, long timecode) {
+            atCluster = cluster - segment;
+            if ((block - bTimecodeLength) > cluster) {
+                atBlock = (int) (block - cluster);
+            }
+            atTimecode = timecode;
+        }
+
+        long atCluster;
+        int atBlock;
+        long atTimecode;
+    }
+
+    class Block {
+
+        InputStream data;
+        int trackNumber;
+        byte flags;
+        int dataSize;
+        long absoluteTimecode;
+
+        boolean isKeyframe() {
+            return (flags & 0x80) == 0x80;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("trackNumber=%s  isKeyFrame=%S  absoluteTimecode=%s", trackNumber, (flags & 0x80) == 0x80, absoluteTimecode);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java

@@ -0,0 +1,47 @@
+package org.schabi.newpipe.streams.io;
+
+import java.io.IOException;
+
+/**
+ * based c#
+ */
+public abstract class SharpStream {
+
+    public abstract int read() throws IOException;
+
+    public abstract int read(byte buffer[]) throws IOException;
+
+    public abstract int read(byte buffer[], int offset, int count) throws IOException;
+
+    public abstract long skip(long amount) throws IOException;
+
+
+    public abstract int available();
+
+    public abstract void rewind() throws IOException;
+
+
+    public abstract void dispose();
+
+    public abstract boolean isDisposed();
+
+
+    public abstract boolean canRewind();
+
+    public abstract boolean canRead();
+
+    public abstract boolean canWrite();
+
+
+    public abstract void write(byte value) throws IOException;
+
+    public abstract void write(byte[] buffer) throws IOException;
+
+    public abstract void write(byte[] buffer, int offset, int count) throws IOException;
+
+    public abstract void flush() throws IOException;
+
+    public void setLength(long length) throws IOException {
+        throw new IOException("Not implemented");
+    }
+}

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

@@ -49,7 +49,6 @@ import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayerActivity;
 import org.schabi.newpipe.player.VideoPlayer;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.settings.SettingsActivity;
 
@@ -117,26 +116,6 @@ public class NavigationHelper {
         context.startActivity(playerIntent);
     }
 
-    public static void playOnOldVideoPlayer(Context context, StreamInfo info) {
-        ArrayList<VideoStream> videoStreamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context, info.getVideoStreams(), null, false));
-        int index = ListHelper.getDefaultResolutionIndex(context, videoStreamsList);
-
-        if (index == -1) {
-            Toast.makeText(context, R.string.video_streams_empty, Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        VideoStream videoStream = videoStreamsList.get(index);
-        Intent intent = new Intent(context, PlayVideoActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(PlayVideoActivity.VIDEO_TITLE, info.getName())
-                .putExtra(PlayVideoActivity.STREAM_URL, videoStream.getUrl())
-                .putExtra(PlayVideoActivity.VIDEO_URL, info.getUrl())
-                .putExtra(PlayVideoActivity.START_POSITION, info.getStartPosition());
-
-        context.startActivity(intent);
-    }
-
     public static void playOnPopupPlayer(final Context context, final PlayQueue queue) {
         if (!PermissionHelper.isPopupEnabled(context)) {
             PermissionHelper.showPopupEnablementToast(context);

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

@@ -0,0 +1,65 @@
+package org.schabi.newpipe.util;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+
+import java.util.List;
+
+public class SecondaryStreamHelper<T extends Stream> {
+    private final int position;
+    private final StreamSizeWrapper<T> streams;
+
+    public SecondaryStreamHelper(StreamSizeWrapper<T> streams, T selectedStream) {
+        this.streams = streams;
+        this.position = streams.getStreamsList().indexOf(selectedStream);
+        if (this.position < 0) throw new RuntimeException("selected stream not found");
+    }
+
+    public T getStream() {
+        return streams.getStreamsList().get(position);
+    }
+
+    public long getSizeInBytes() {
+        return streams.getSizeInBytes(position);
+    }
+
+    /**
+     * find the correct audio stream for the desired video stream
+     *
+     * @param audioStreams list of audio streams
+     * @param videoStream  desired video ONLY stream
+     * @return selected audio stream or null if a candidate was not found
+     */
+    public static AudioStream getAudioStreamFor(@NonNull List<AudioStream> audioStreams, @NonNull VideoStream videoStream) {
+        switch (videoStream.getFormat()) {
+            case WEBM:
+            case MPEG_4:
+                break;
+            default:
+                return null;
+        }
+
+        boolean m4v = videoStream.getFormat() == MediaFormat.MPEG_4;
+
+        for (AudioStream audio : audioStreams) {
+            if (audio.getFormat() == (m4v ? MediaFormat.M4A : MediaFormat.WEBMA)) {
+                return audio;
+            }
+        }
+
+        // retry, but this time in reverse order
+        for (int i = audioStreams.size() - 1; i >= 0; i--) {
+            AudioStream audio = audioStreams.get(i);
+            if (audio.getFormat() == (m4v ? MediaFormat.MP3 : MediaFormat.OPUS)) {
+                return audio;
+            }
+        }
+
+        return null;
+    }
+}

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

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.util;
 
 import android.content.Context;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +14,7 @@ import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 
 import java.io.Serializable;
@@ -28,26 +30,34 @@ import us.shandian.giga.util.Utility;
 /**
  * A list adapter for a list of {@link Stream streams}, currently supporting {@link VideoStream} and {@link AudioStream}.
  */
-public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
+public class StreamItemAdapter<T extends Stream, U extends Stream> extends BaseAdapter {
     private final Context context;
 
     private final StreamSizeWrapper<T> streamsWrapper;
-    private final boolean showIconNoAudio;
+    private final SparseArray<SecondaryStreamHelper<U>> secondaryStreams;
 
-    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, boolean showIconNoAudio) {
+    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, SparseArray<SecondaryStreamHelper<U>> secondaryStreams) {
         this.context = context;
         this.streamsWrapper = streamsWrapper;
-        this.showIconNoAudio = showIconNoAudio;
+        this.secondaryStreams = secondaryStreams;
+    }
+
+    public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, boolean showIconNoAudio) {
+        this(context, streamsWrapper, showIconNoAudio ? new SparseArray<>() : null);
     }
 
     public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper) {
-        this(context, streamsWrapper, false);
+        this(context, streamsWrapper, null);
     }
 
     public List<T> getAll() {
         return streamsWrapper.getStreamsList();
     }
 
+    public SparseArray<SecondaryStreamHelper<U>> getAllSecondary() {
+        return secondaryStreams;
+    }
+
     @Override
     public int getCount() {
         return streamsWrapper.getStreamsList().size();
@@ -89,29 +99,46 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
         String qualityString;
 
         if (stream instanceof VideoStream) {
-            qualityString = ((VideoStream) stream).getResolution();
+            VideoStream videoStream = ((VideoStream) stream);
+            qualityString = videoStream.getResolution();
 
-            if (!showIconNoAudio) {
+            if (secondaryStreams != null) {
-                woSoundIconVisibility = View.GONE;
+                if (videoStream.isVideoOnly()) {
-            } else if (((VideoStream) stream).isVideoOnly()) {
+                    woSoundIconVisibility = secondaryStreams.get(position) == null ? View.VISIBLE : View.INVISIBLE;
-                woSoundIconVisibility = View.VISIBLE;
+                } else if (isDropdownItem) {
-            } else if (isDropdownItem) {
+                    woSoundIconVisibility = View.INVISIBLE;
-                woSoundIconVisibility = View.INVISIBLE;
+                }
             }
         } else if (stream instanceof AudioStream) {
             qualityString = ((AudioStream) stream).getAverageBitrate() + "kbps";
+        } else if (stream instanceof SubtitlesStream) {
+            qualityString = ((SubtitlesStream) stream).getDisplayLanguageName();
+            if (((SubtitlesStream) stream).isAutoGenerated()) {
+                qualityString += " (" + context.getString(R.string.caption_auto_generated) + ")";
+            }
         } else {
             qualityString = stream.getFormat().getSuffix();
         }
 
         if (streamsWrapper.getSizeInBytes(position) > 0) {
-            sizeView.setText(streamsWrapper.getFormattedSize(position));
+            SecondaryStreamHelper secondary = secondaryStreams == null ? null : secondaryStreams.get(position);
+            if (secondary != null) {
+                long size = secondary.getSizeInBytes() + streamsWrapper.getSizeInBytes(position);
+                sizeView.setText(Utility.formatBytes(size));
+            } else {
+                sizeView.setText(streamsWrapper.getFormattedSize(position));
+            }
             sizeView.setVisibility(View.VISIBLE);
         } else {
             sizeView.setVisibility(View.GONE);
         }
 
-        formatNameView.setText(stream.getFormat().getName());
+        if (stream instanceof SubtitlesStream) {
+            formatNameView.setText(((SubtitlesStream) stream).getLanguageTag());
+        } else {
+            formatNameView.setText(stream.getFormat().getName());
+        }
+
         qualityView.setText(qualityString);
         woSoundIconView.setVisibility(woSoundIconVisibility);
 
@@ -122,15 +149,17 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
      * A wrapper class that includes a way of storing the stream sizes.
      */
     public static class StreamSizeWrapper<T extends Stream> implements Serializable {
-        private static final StreamSizeWrapper<Stream> EMPTY = new StreamSizeWrapper<>(Collections.emptyList());
+        private static final StreamSizeWrapper<Stream> EMPTY = new StreamSizeWrapper<>(Collections.emptyList(), null);
         private final List<T> streamsList;
         private final long[] streamSizes;
+        private final String unknownSize;
 
-        public StreamSizeWrapper(List<T> streamsList) {
+        public StreamSizeWrapper(List<T> streamsList, Context context) {
             this.streamsList = streamsList;
             this.streamSizes = new long[streamsList.size()];
+            this.unknownSize = context == null ? "--.-" : context.getString(R.string.unknown_content);
 
-            for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -1;
+            for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -2;
         }
 
         /**
@@ -143,7 +172,7 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
             final Callable<Boolean> fetchAndSet = () -> {
                 boolean hasChanged = false;
                 for (X stream : streamsWrapper.getStreamsList()) {
-                    if (streamsWrapper.getSizeInBytes(stream) > 0) {
+                    if (streamsWrapper.getSizeInBytes(stream) > -2) {
                         continue;
                     }
 
@@ -173,11 +202,18 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
         }
 
         public String getFormattedSize(int streamIndex) {
-            return Utility.formatBytes(getSizeInBytes(streamIndex));
+            return formatSize(getSizeInBytes(streamIndex));
         }
 
         public String getFormattedSize(T stream) {
-            return Utility.formatBytes(getSizeInBytes(stream));
+            return formatSize(getSizeInBytes(stream));
+        }
+
+        private String formatSize(long size) {
+            if (size > -1) {
+                return Utility.formatBytes(size);
+            }
+            return unknownSize;
         }
 
         public void setSize(int streamIndex, long sizeInBytes) {
@@ -193,4 +229,4 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
             return (StreamSizeWrapper<X>) EMPTY;
         }
     }
-}
+}

app/src/main/java/us/shandian/giga/get/DownloadDataSource.java

@@ -1,40 +0,0 @@
-package us.shandian.giga.get;
-
-import java.util.List;
-
-/**
- * Provides access to the storage of {@link DownloadMission}s
- */
-public interface DownloadDataSource {
-
-    /**
-     * Load all missions
-     *
-     * @return a list of download missions
-     */
-    List<DownloadMission> loadMissions();
-
-    /**
-     * Add a download mission to the storage
-     *
-     * @param downloadMission the download mission to add
-     * @return the identifier of the mission
-     */
-    void addMission(DownloadMission downloadMission);
-
-    /**
-     * Update a download mission which exists in the storage
-     *
-     * @param downloadMission the download mission to update
-     * @throws IllegalArgumentException if the mission was not added to storage
-     */
-    void updateMission(DownloadMission downloadMission);
-
-
-    /**
-     * Delete a download mission
-     *
-     * @param downloadMission the mission to delete
-     */
-    void deleteMission(DownloadMission downloadMission);
-}

app/src/main/java/us/shandian/giga/get/DownloadInitializer.java

@@ -0,0 +1,185 @@
+package us.shandian.giga.get;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.nio.channels.ClosedByInterruptException;
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadInitializer extends Thread {
+    private final static String TAG = "DownloadInitializer";
+    final static int mId = 0;
+
+    private DownloadMission mMission;
+    private HttpURLConnection mConn;
+
+    DownloadInitializer(@NonNull DownloadMission mission) {
+        mMission = mission;
+        mConn = null;
+    }
+
+    @Override
+    public void run() {
+        if (mMission.current > 0) mMission.resetState();
+
+        int retryCount = 0;
+        while (true) {
+            try {
+                mMission.currentThreadCount = mMission.threadCount;
+
+                mConn = mMission.openConnection(mId, -1, -1);
+                mMission.establishConnection(mId, mConn);
+
+                if (!mMission.running || Thread.interrupted()) return;
+
+                mMission.length = Utility.getContentLength(mConn);
+
+
+                if (mMission.length == 0) {
+                    mMission.notifyError(DownloadMission.ERROR_HTTP_NO_CONTENT, null);
+                    return;
+                }
+
+                // check for dynamic generated content
+                if (mMission.length == -1 && mConn.getResponseCode() == 200) {
+                    mMission.blocks = 0;
+                    mMission.length = 0;
+                    mMission.fallback = true;
+                    mMission.unknownLength = true;
+                    mMission.currentThreadCount = 1;
+
+                    if (DEBUG) {
+                        Log.d(TAG, "falling back (unknown length)");
+                    }
+                } else {
+                    // Open again
+                    mConn = mMission.openConnection(mId, mMission.length - 10, mMission.length);
+                    mMission.establishConnection(mId, mConn);
+
+                    if (!mMission.running || Thread.interrupted()) return;
+
+                    synchronized (mMission.blockState) {
+                        if (mConn.getResponseCode() == 206) {
+                            if (mMission.currentThreadCount > 1) {
+                                mMission.blocks = mMission.length / DownloadMission.BLOCK_SIZE;
+
+                                if (mMission.currentThreadCount > mMission.blocks) {
+                                    mMission.currentThreadCount = (int) mMission.blocks;
+                                }
+                                if (mMission.currentThreadCount <= 0) {
+                                    mMission.currentThreadCount = 1;
+                                }
+                                if (mMission.blocks * DownloadMission.BLOCK_SIZE < mMission.length) {
+                                    mMission.blocks++;
+                                }
+                            } else {
+                                // if one thread is solicited don't calculate blocks, is useless
+                                mMission.blocks = 1;
+                                mMission.fallback = true;
+                                mMission.unknownLength = false;
+                            }
+
+                            if (DEBUG) {
+                                Log.d(TAG, "http response code = " + mConn.getResponseCode());
+                            }
+                        } else {
+                            // Fallback to single thread
+                            mMission.blocks = 0;
+                            mMission.fallback = true;
+                            mMission.unknownLength = false;
+                            mMission.currentThreadCount = 1;
+
+                            if (DEBUG) {
+                                Log.d(TAG, "falling back due http response code = " + mConn.getResponseCode());
+                            }
+                        }
+
+                        for (long i = 0; i < mMission.currentThreadCount; i++) {
+                            mMission.threadBlockPositions.add(i);
+                            mMission.threadBytePositions.add(0L);
+                        }
+                    }
+
+                    if (!mMission.running || Thread.interrupted()) return;
+                }
+
+                File file;
+                if (mMission.current == 0) {
+                    file = new File(mMission.location);
+                    if (!Utility.mkdir(file, true)) {
+                        mMission.notifyError(DownloadMission.ERROR_PATH_CREATION, null);
+                        return;
+                    }
+
+                    file = new File(file, mMission.name);
+
+                    // if the name is used by another process, delete it
+                    if (file.exists() && !file.isFile() && !file.delete()) {
+                        mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
+                        return;
+                    }
+
+                    if (!file.exists() && !file.createNewFile()) {
+                        mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
+                        return;
+                    }
+                } else {
+                    file = new File(mMission.location, mMission.name);
+                }
+
+                RandomAccessFile af = new RandomAccessFile(file, "rw");
+                af.setLength(mMission.offsets[mMission.current] + mMission.length);
+                af.seek(mMission.offsets[mMission.current]);
+                af.close();
+
+                if (!mMission.running || Thread.interrupted()) return;
+
+                mMission.running = false;
+                break;
+            } catch (InterruptedIOException | ClosedByInterruptException e) {
+                return;
+            } catch (Exception e) {
+                if (!mMission.running) return;
+
+                if (e instanceof IOException && e.getMessage().contains("Permission denied")) {
+                    mMission.notifyError(DownloadMission.ERROR_PERMISSION_DENIED, e);
+                    return;
+                }
+
+                if (retryCount++ > mMission.maxRetry) {
+                    Log.e(TAG, "initializer failed", e);
+                    mMission.notifyError(e);
+                    return;
+                }
+
+                Log.e(TAG, "initializer failed, retrying", e);
+            }
+        }
+
+        // hide marquee in the progress bar
+        mMission.done++;
+
+        mMission.start();
+    }
+
+    @Override
+    public void interrupt() {
+        super.interrupt();
+
+        if (mConn != null) {
+            try {
+                mConn.disconnect();
+            } catch (Exception e) {
+                // nothing to do
+            }
+        }
+    }
+}

app/src/main/java/us/shandian/giga/get/DownloadManager.java

@@ -1,53 +0,0 @@
-package us.shandian.giga.get;
-
-public interface DownloadManager {
-    int BLOCK_SIZE = 512 * 1024;
-
-    /**
-     * Start a new download mission
-     *
-     * @param url      the url to download
-     * @param location the location
-     * @param name     the name of the file to create
-     * @param isAudio  true if the download is an audio file
-     * @param threads  the number of threads maximal used to download chunks of the file.    @return the identifier of the mission.
-     */
-    int startMission(String url, String location, String name, boolean isAudio, int threads);
-
-    /**
-     * Resume the execution of a download mission.
-     *
-     * @param id the identifier of the mission to resume.
-     */
-    void resumeMission(int id);
-
-    /**
-     * Pause the execution of a download mission.
-     *
-     * @param id the identifier of the mission to pause.
-     */
-    void pauseMission(int id);
-
-    /**
-     * Deletes the mission from the downloaded list but keeps the downloaded file.
-     *
-     * @param id The mission identifier
-     */
-    void deleteMission(int id);
-
-    /**
-     * Get the download mission by its identifier
-     *
-     * @param id the identifier of the download mission
-     * @return the download mission or null if the mission doesn't exist
-     */
-    DownloadMission getMission(int id);
-
-    /**
-     * Get the number of download missions.
-     *
-     * @return the number of download missions.
-     */
-    int getCount();
-
-}

app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java

@@ -1,395 +0,0 @@
-package us.shandian.giga.get;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import org.schabi.newpipe.download.ExtSDDownloadFailedActivity;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import us.shandian.giga.util.Utility;
-
-import static org.schabi.newpipe.BuildConfig.DEBUG;
-
-public class DownloadManagerImpl implements DownloadManager {
-    private static final String TAG = DownloadManagerImpl.class.getSimpleName();
-    private final DownloadDataSource mDownloadDataSource;
-
-    private final ArrayList<DownloadMission> mMissions = new ArrayList<>();
-    @NonNull
-    private final Context context;
-
-    /**
-     * Create a new instance
-     *
-     * @param searchLocations    the directories to search for unfinished downloads
-     * @param downloadDataSource the data source for finished downloads
-     */
-    public DownloadManagerImpl(Collection<String> searchLocations, DownloadDataSource downloadDataSource) {
-        mDownloadDataSource = downloadDataSource;
-        this.context = null;
-        loadMissions(searchLocations);
-    }
-
-    public DownloadManagerImpl(Collection<String> searchLocations, DownloadDataSource downloadDataSource, Context context) {
-        mDownloadDataSource = downloadDataSource;
-        this.context = context;
-        loadMissions(searchLocations);
-    }
-
-    @Override
-    public int startMission(String url, String location, String name, boolean isAudio, int threads) {
-        DownloadMission existingMission = getMissionByLocation(location, name);
-        if (existingMission != null) {
-            // Already downloaded or downloading
-            if (existingMission.finished) {
-                // Overwrite mission
-                deleteMission(mMissions.indexOf(existingMission));
-            } else {
-                // Rename file (?)
-                try {
-                    name = generateUniqueName(location, name);
-                } catch (Exception e) {
-                    Log.e(TAG, "Unable to generate unique name", e);
-                    name = System.currentTimeMillis() + name;
-                    Log.i(TAG, "Using " + name);
-                }
-            }
-        }
-
-        DownloadMission mission = new DownloadMission(name, url, location);
-        mission.timestamp = System.currentTimeMillis();
-        mission.threadCount = threads;
-        mission.addListener(new MissionListener(mission));
-        new Initializer(mission).start();
-        return insertMission(mission);
-    }
-
-    @Override
-    public void resumeMission(int i) {
-        DownloadMission d = getMission(i);
-        if (!d.running && d.errCode == -1) {
-            d.start();
-        }
-    }
-
-    @Override
-    public void pauseMission(int i) {
-        DownloadMission d = getMission(i);
-        if (d.running) {
-            d.pause();
-        }
-    }
-
-    @Override
-    public void deleteMission(int i) {
-        DownloadMission mission = getMission(i);
-        if (mission.finished) {
-            mDownloadDataSource.deleteMission(mission);
-        }
-        mission.delete();
-        mMissions.remove(i);
-    }
-
-    private void loadMissions(Iterable<String> searchLocations) {
-        mMissions.clear();
-        loadFinishedMissions();
-        for (String location : searchLocations) {
-            loadMissions(location);
-        }
-
-    }
-
-    /**
-     * Sort a list of mission by its timestamp. Oldest first
-     * @param missions the missions to sort
-     */
-    static void sortByTimestamp(List<DownloadMission> missions) {
-        Collections.sort(missions, new Comparator<DownloadMission>() {
-            @Override
-            public int compare(DownloadMission o1, DownloadMission o2) {
-                return Long.compare(o1.timestamp, o2.timestamp);
-            }
-        });
-    }
-
-    /**
-     * Loads finished missions from the data source
-     */
-    private void loadFinishedMissions() {
-        List<DownloadMission> finishedMissions = mDownloadDataSource.loadMissions();
-        if (finishedMissions == null) {
-            finishedMissions = new ArrayList<>();
-        }
-        // Ensure its sorted
-        sortByTimestamp(finishedMissions);
-
-        mMissions.ensureCapacity(mMissions.size() + finishedMissions.size());
-        for (DownloadMission mission : finishedMissions) {
-            File downloadedFile = mission.getDownloadedFile();
-            if (!downloadedFile.isFile()) {
-                if (DEBUG) {
-                    Log.d(TAG, "downloaded file removed: " + downloadedFile.getAbsolutePath());
-                }
-                mDownloadDataSource.deleteMission(mission);
-            } else {
-                mission.length = downloadedFile.length();
-                mission.finished = true;
-                mission.running = false;
-                mMissions.add(mission);
-            }
-        }
-    }
-
-    private void loadMissions(String location) {
-
-        File f = new File(location);
-
-        if (f.exists() && f.isDirectory()) {
-            File[] subs = f.listFiles();
-
-            if (subs == null) {
-                Log.e(TAG, "listFiles() returned null");
-                return;
-            }
-
-            for (File sub : subs) {
-                if (sub.isFile() && sub.getName().endsWith(".giga")) {
-                    DownloadMission mis = Utility.readFromFile(sub.getAbsolutePath());
-                    if (mis != null) {
-                        if (mis.finished) {
-                            if (!sub.delete()) {
-                                Log.w(TAG, "Unable to delete .giga file: " + sub.getPath());
-                            }
-                            continue;
-                        }
-
-                        mis.running = false;
-                        mis.recovered = true;
-                        insertMission(mis);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public DownloadMission getMission(int i) {
-        return mMissions.get(i);
-    }
-
-    @Override
-    public int getCount() {
-        return mMissions.size();
-    }
-
-    private int insertMission(DownloadMission mission) {
-        int i = -1;
-
-        DownloadMission m = null;
-
-        if (mMissions.size() > 0) {
-            do {
-                m = mMissions.get(++i);
-            } while (m.timestamp > mission.timestamp && i < mMissions.size() - 1);
-
-            //if (i > 0) i--;
-        } else {
-            i = 0;
-        }
-
-        mMissions.add(i, mission);
-
-        return i;
-    }
-
-    /**
-     * Get a mission by its location and name
-     *
-     * @param location the location
-     * @param name     the name
-     * @return the mission or null if no such mission exists
-     */
-    private
-    @Nullable
-    DownloadMission getMissionByLocation(String location, String name) {
-        for (DownloadMission mission : mMissions) {
-            if (location.equals(mission.location) && name.equals(mission.name)) {
-                return mission;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Splits the filename into name and extension
-     * <p>
-     * Dots are ignored if they appear: not at all, at the beginning of the file,
-     * at the end of the file
-     *
-     * @param name the name to split
-     * @return a string array with a length of 2 containing the name and the extension
-     */
-    private static String[] splitName(String name) {
-        int dotIndex = name.lastIndexOf('.');
-        if (dotIndex <= 0 || (dotIndex == name.length() - 1)) {
-            return new String[]{name, ""};
-        } else {
-            return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
-        }
-    }
-
-    /**
-     * Generates a unique file name.
-     * <p>
-     * e.g. "myname (1).txt" if the name "myname.txt" exists.
-     *
-     * @param location the location (to check for existing files)
-     * @param name     the name of the file
-     * @return the unique file name
-     * @throws IllegalArgumentException if the location is not a directory
-     * @throws SecurityException        if the location is not readable
-     */
-    private static String generateUniqueName(String location, String name) {
-        if (location == null) throw new NullPointerException("location is null");
-        if (name == null) throw new NullPointerException("name is null");
-        File destination = new File(location);
-        if (!destination.isDirectory()) {
-            throw new IllegalArgumentException("location is not a directory: " + location);
-        }
-        final String[] nameParts = splitName(name);
-        String[] existingName = destination.list(new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                return name.startsWith(nameParts[0]);
-            }
-        });
-        Arrays.sort(existingName);
-        String newName;
-        int downloadIndex = 0;
-        do {
-            newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
-            ++downloadIndex;
-            if (downloadIndex == 1000) {  // Probably an error on our side
-                throw new RuntimeException("Too many existing files");
-            }
-        } while (Arrays.binarySearch(existingName, newName) >= 0);
-        return newName;
-    }
-
-    private class Initializer extends Thread {
-        private final DownloadMission mission;
-        private final Handler handler;
-
-        public Initializer(DownloadMission mission) {
-            this.mission = mission;
-            this.handler = new Handler();
-        }
-
-        @Override
-        public void run() {
-            try {
-                URL url = new URL(mission.url);
-                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                mission.length = conn.getContentLength();
-
-                if (mission.length <= 0) {
-                    mission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
-                    //mission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
-                    return;
-                }
-
-                // Open again
-                conn = (HttpURLConnection) url.openConnection();
-                conn.setRequestProperty("Range", "bytes=" + (mission.length - 10) + "-" + mission.length);
-
-                if (conn.getResponseCode() != 206) {
-                    // Fallback to single thread if no partial content support
-                    mission.fallback = true;
-
-                    if (DEBUG) {
-                        Log.d(TAG, "falling back");
-                    }
-                }
-
-                if (DEBUG) {
-                    Log.d(TAG, "response = " + conn.getResponseCode());
-                }
-
-                mission.blocks = mission.length / BLOCK_SIZE;
-
-                if (mission.threadCount > mission.blocks) {
-                    mission.threadCount = (int) mission.blocks;
-                }
-
-                if (mission.threadCount <= 0) {
-                    mission.threadCount = 1;
-                }
-
-                if (mission.blocks * BLOCK_SIZE < mission.length) {
-                    mission.blocks++;
-                }
-
-
-                new File(mission.location).mkdirs();
-                new File(mission.location + "/" + mission.name).createNewFile();
-                RandomAccessFile af = new RandomAccessFile(mission.location + "/" + mission.name, "rw");
-                af.setLength(mission.length);
-                af.close();
-
-                mission.start();
-            } catch (IOException ie) {
-                if(context == null) throw new RuntimeException(ie);
-
-                if(ie.getMessage().contains("Permission denied")) {
-                    handler.post(() ->
-                        context.startActivity(new Intent(context, ExtSDDownloadFailedActivity.class)));
-                } else throw new RuntimeException(ie);
-            } catch (Exception e) {
-                // TODO Notify
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    /**
-     * Waits for mission to finish to add it to the {@link #mDownloadDataSource}
-     */
-    private class MissionListener implements DownloadMission.MissionListener {
-        private final DownloadMission mMission;
-
-        private MissionListener(DownloadMission mission) {
-            if (mission == null) throw new NullPointerException("mission is null");
-            // Could the mission be passed in onFinish()?
-            mMission = mission;
-        }
-
-        @Override
-        public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
-        }
-
-        @Override
-        public void onFinish(DownloadMission downloadMission) {
-            mDownloadDataSource.addMission(mMission);
-        }
-
-        @Override
-        public void onError(DownloadMission downloadMission, int errCode) {
-        }
-    }
-}

app/src/main/java/us/shandian/giga/get/DownloadMission.java

@@ -1,102 +1,173 @@
 package us.shandian.giga.get;
 
 import android.os.Handler;
-import android.os.Looper;
+import android.os.Message;
 import android.util.Log;
 
 import java.io.File;
-import java.io.ObjectInputStream;
+import java.io.FileNotFoundException;
-import java.io.Serializable;
+import java.io.IOException;
-import java.lang.ref.WeakReference;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
+import javax.net.ssl.SSLException;
+
+import us.shandian.giga.postprocessing.Postprocessing;
+import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.util.Utility;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
-public class DownloadMission implements Serializable {
+public class DownloadMission extends Mission {
-    private static final long serialVersionUID = 0L;
+    private static final long serialVersionUID = 3L;// last bump: 8 november 2018
 
-    private static final String TAG = DownloadMission.class.getSimpleName();
+    static final int BUFFER_SIZE = 64 * 1024;
+    final static int BLOCK_SIZE = 512 * 1024;
 
-    public interface MissionListener {
+    private static final String TAG = "DownloadMission";
-        HashMap<MissionListener, Handler> handlerStore = new HashMap<>();
 
-        void onProgressUpdate(DownloadMission downloadMission, long done, long total);
+    public static final int ERROR_NOTHING = -1;
-
+    public static final int ERROR_PATH_CREATION = 1000;
-        void onFinish(DownloadMission downloadMission);
+    public static final int ERROR_FILE_CREATION = 1001;
-
+    public static final int ERROR_UNKNOWN_EXCEPTION = 1002;
-        void onError(DownloadMission downloadMission, int errCode);
+    public static final int ERROR_PERMISSION_DENIED = 1003;
-    }
+    public static final int ERROR_SSL_EXCEPTION = 1004;
-
+    public static final int ERROR_UNKNOWN_HOST = 1005;
-    public static final int ERROR_SERVER_UNSUPPORTED = 206;
+    public static final int ERROR_CONNECT_HOST = 1006;
-    public static final int ERROR_UNKNOWN = 233;
+    public static final int ERROR_POSTPROCESSING = 1007;
+    public static final int ERROR_HTTP_NO_CONTENT = 204;
+    public static final int ERROR_HTTP_UNSUPPORTED_RANGE = 206;
 
     /**
-     * The filename
+     * The urls of the file to download
      */
-    public String name;
+    public String[] urls;
 
     /**
-     * The url of the file to download
+     * Number of blocks the size of {@link DownloadMission#BLOCK_SIZE}
      */
-    public String url;
+    long blocks = -1;
-
-    /**
-     * The directory to store the download
-     */
-    public String location;
-
-    /**
-     * Number of blocks the size of {@link DownloadManager#BLOCK_SIZE}
-     */
-    public long blocks;
-
-    /**
-     * Number of bytes
-     */
-    public long length;
 
     /**
      * Number of bytes downloaded
      */
     public long done;
+
+    /**
+     * Indicates a file generated dynamically on the web server
+     */
+    public boolean unknownLength;
+
+    /**
+     * offset in the file where the data should be written
+     */
+    public long[] offsets;
+
+    /**
+     * The post-processing algorithm arguments
+     */
+    public String[] postprocessingArgs;
+
+    /**
+     * The post-processing algorithm name
+     */
+    public String postprocessingName;
+
+    /**
+     * Indicates if the post-processing state:
+     * 0: ready
+     * 1: running
+     * 2: completed
+     */
+    public int postprocessingState;
+
+    /**
+     * Indicate if the post-processing algorithm works on the same file
+     */
+    public boolean postprocessingThis;
+
+    /**
+     * The current resource to download {@code urls[current]}
+     */
+    public int current;
+
+    /**
+     * Metadata where the mission state is saved
+     */
+    public File metadata;
+
+    /**
+     * maximum attempts
+     */
+    public int maxRetry;
+
+    /**
+     * Approximated final length, this represent the sum of all resources sizes
+     */
+    public long nearLength;
+
     public int threadCount = 3;
-    public int finishCount;
+    boolean fallback;
-    private final List<Long> threadPositions = new ArrayList<>();
+    private int finishCount;
-    public final Map<Long, Boolean> blockState = new HashMap<>();
+    public transient boolean running;
-    public boolean running;
+    public transient boolean enqueued = true;
-    public boolean finished;
-    public boolean fallback;
-    public int errCode = -1;
-    public long timestamp;
 
+    public int errCode = ERROR_NOTHING;
+
+    public transient Exception errObject = null;
     public transient boolean recovered;
-
+    public transient Handler mHandler;
-    private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<>();
     private transient boolean mWritingToFile;
 
-    private static final int NO_IDENTIFIER = -1;
+    @SuppressWarnings("UseSparseArrays")// LongSparseArray is not serializable
+    final HashMap<Long, Boolean> blockState = new HashMap<>();
+    final List<Long> threadBlockPositions = new ArrayList<>();
+    final List<Long> threadBytePositions = new ArrayList<>();
+
+    private transient boolean deleted;
+    int currentThreadCount;
+    private transient Thread[] threads = new Thread[0];
+    private transient Thread init = null;
+
+
+    protected DownloadMission() {
 
-    public DownloadMission() {
     }
 
-    public DownloadMission(String name, String url, String location) {
+    public DownloadMission(String url, String name, String location, char kind) {
+        this(new String[]{url}, name, location, kind, null, null);
+    }
+
+    public DownloadMission(String[] urls, String name, String location, char kind, String postprocessingName, String[] postprocessingArgs) {
         if (name == null) throw new NullPointerException("name is null");
         if (name.isEmpty()) throw new IllegalArgumentException("name is empty");
-        if (url == null) throw new NullPointerException("url is null");
+        if (urls == null) throw new NullPointerException("urls is null");
-        if (url.isEmpty()) throw new IllegalArgumentException("url is empty");
+        if (urls.length < 1) throw new IllegalArgumentException("urls is empty");
         if (location == null) throw new NullPointerException("location is null");
         if (location.isEmpty()) throw new IllegalArgumentException("location is empty");
-        this.url = url;
+        this.urls = urls;
         this.name = name;
         this.location = location;
-    }
+        this.kind = kind;
+        this.offsets = new long[urls.length];
 
+        if (postprocessingName != null) {
+            Postprocessing algorithm = Postprocessing.getAlgorithm(postprocessingName, null);
+            this.postprocessingThis = algorithm.worksOnSameFile;
+            this.offsets[0] = algorithm.recommendedReserve;
+            this.postprocessingName = postprocessingName;
+            this.postprocessingArgs = postprocessingArgs;
+        } else {
+            if (DEBUG && urls.length > 1) {
+                Log.w(TAG, "mission created with multiple urls ¿missing post-processing algorithm?");
+            }
+        }
+    }
 
     private void checkBlock(long block) {
         if (block < 0 || block >= blocks) {
@@ -110,12 +181,12 @@ public class DownloadMission implements Serializable {
      * @param block the block identifier
      * @return true if the block is reserved and false if otherwise
      */
-    public boolean isBlockPreserved(long block) {
+    boolean isBlockPreserved(long block) {
         checkBlock(block);
         return blockState.containsKey(block) ? blockState.get(block) : false;
     }
 
-    public void preserveBlock(long block) {
+    void preserveBlock(long block) {
         checkBlock(block);
         synchronized (blockState) {
             blockState.put(block, true);
@@ -123,125 +194,218 @@ public class DownloadMission implements Serializable {
     }
 
     /**
-     * Set the download position of the file
+     * Set the block of the file
      *
      * @param threadId the identifier of the thread
-     * @param position the download position of the thread
+     * @param position the block of the thread
      */
-    public void setPosition(int threadId, long position) {
+    void setBlockPosition(int threadId, long position) {
-        threadPositions.set(threadId, position);
+        threadBlockPositions.set(threadId, position);
     }
 
     /**
-     * Get the position of a thread
+     * Get the block of a file
      *
      * @param threadId the identifier of the thread
-     * @return the position for the thread
+     * @return the block for the thread
      */
-    public long getPosition(int threadId) {
+    long getBlockPosition(int threadId) {
-        return threadPositions.get(threadId);
+        return threadBlockPositions.get(threadId);
     }
 
-    public synchronized void notifyProgress(long deltaLen) {
+    /**
+     * Save the position of the desired thread
+     *
+     * @param threadId the identifier of the thread
+     * @param position the relative position in bytes or zero
+     */
+    void setThreadBytePosition(int threadId, long position) {
+        threadBytePositions.set(threadId, position);
+    }
+
+    /**
+     * Get position inside of the thread, where thread will be resumed
+     *
+     * @param threadId the identifier of the thread
+     * @return the relative position in bytes or zero
+     */
+    long getThreadBytePosition(int threadId) {
+        return threadBytePositions.get(threadId);
+    }
+
+    /**
+     * Open connection
+     *
+     * @param threadId   id of the calling thread, used only for debug
+     * @param rangeStart range start
+     * @param rangeEnd   range end
+     * @return a {@link java.net.URLConnection URLConnection} linking to the URL.
+     * @throws IOException if an I/O exception occurs.
+     */
+    HttpURLConnection openConnection(int threadId, long rangeStart, long rangeEnd) throws IOException {
+        URL url = new URL(urls[current]);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setInstanceFollowRedirects(true);
+
+        if (rangeStart >= 0) {
+            String req = "bytes=" + rangeStart + "-";
+            if (rangeEnd > 0) req += rangeEnd;
+
+            conn.setRequestProperty("Range", req);
+
+            if (DEBUG) {
+                Log.d(TAG, threadId + ":" + conn.getRequestProperty("Range"));
+            }
+        }
+
+        return conn;
+    }
+
+    /**
+     * @param threadId id of the calling thread
+     * @param conn     Opens and establish the communication
+     * @throws IOException if an error occurred connecting to the server.
+     * @throws HttpError   if the HTTP Status-Code is not satisfiable
+     */
+    void establishConnection(int threadId, HttpURLConnection conn) throws IOException, HttpError {
+        conn.connect();
+        int statusCode = conn.getResponseCode();
+
+        if (DEBUG) {
+            Log.d(TAG, threadId + ":Content-Length=" + conn.getContentLength() + " Code:" + statusCode);
+        }
+
+        switch (statusCode) {
+            case 204:
+            case 205:
+            case 207:
+                throw new HttpError(conn.getResponseCode());
+            case 416:
+                return;// let the download thread handle this error
+            default:
+                if (statusCode < 200 || statusCode > 299) {
+                    throw new HttpError(statusCode);
+                }
+        }
+
+    }
+
+
+    private void notify(int what) {
+        Message m = new Message();
+        m.what = what;
+        m.obj = this;
+
+        mHandler.sendMessage(m);
+    }
+
+    synchronized void notifyProgress(long deltaLen) {
         if (!running) return;
 
         if (recovered) {
             recovered = false;
         }
 
+        if (unknownLength) {
+            length += deltaLen;// Update length before proceeding
+        }
+
         done += deltaLen;
 
         if (done > length) {
             done = length;
         }
 
-        if (done != length) {
+        if (done != length && !deleted && !mWritingToFile) {
-            writeThisToFile();
+            mWritingToFile = true;
+            runAsync(-2, this::writeThisToFile);
         }
 
-        for (WeakReference<MissionListener> ref : mListeners) {
+        notify(DownloadManagerService.MESSAGE_PROGRESS);
-            final MissionListener listener = ref.get();
+    }
-            if (listener != null) {
+
-                MissionListener.handlerStore.get(listener).post(new Runnable() {
+    synchronized void notifyError(Exception err) {
-                    @Override
+        Log.e(TAG, "notifyError()", err);
-                    public void run() {
+
-                        listener.onProgressUpdate(DownloadMission.this, done, length);
+        if (err instanceof FileNotFoundException) {
-                    }
+            notifyError(ERROR_FILE_CREATION, null);
-                });
+        } else if (err instanceof SSLException) {
-            }
+            notifyError(ERROR_SSL_EXCEPTION, null);
+        } else if (err instanceof HttpError) {
+            notifyError(((HttpError) err).statusCode, null);
+        } else if (err instanceof ConnectException) {
+            notifyError(ERROR_CONNECT_HOST, null);
+        } else if (err instanceof UnknownHostException) {
+            notifyError(ERROR_UNKNOWN_HOST, null);
+        } else {
+            notifyError(ERROR_UNKNOWN_EXCEPTION, err);
         }
     }
 
-    /**
+    synchronized void notifyError(int code, Exception err) {
-     * Called by a download thread when it finished.
+        Log.e(TAG, "notifyError() code = " + code, err);
-     */
+
-    public synchronized void notifyFinished() {
+        errCode = code;
-        if (errCode > 0) return;
+        errObject = err;
+
+        pause();
+
+        notify(DownloadManagerService.MESSAGE_ERROR);
+    }
+
+    synchronized void notifyFinished() {
+        if (errCode > ERROR_NOTHING) return;
 
         finishCount++;
 
-        if (finishCount == threadCount) {
+        if (finishCount == currentThreadCount) {
-            onFinish();
+            if (errCode != ERROR_NOTHING) return;
+
+            if (DEBUG) {
+                Log.d(TAG, "onFinish" + (current + 1) + "/" + urls.length);
+            }
+
+            if ((current + 1) < urls.length) {
+                // prepare next sub-mission
+                long current_offset = offsets[current++];
+                offsets[current] = current_offset + length;
+                initializer();
+                return;
+            }
+
+            current++;
+            unknownLength = false;
+
+            if (!doPostprocessing()) return;
+
+            running = false;
+            deleteThisFromFile();
+
+            notify(DownloadManagerService.MESSAGE_FINISHED);
         }
     }
 
-    /**
+    private void notifyPostProcessing(int state) {
-     * Called when all parts are downloaded
-     */
-    private void onFinish() {
-        if (errCode > 0) return;
-
         if (DEBUG) {
-            Log.d(TAG, "onFinish");
+            String action;
-        }
+            switch (state) {
-
+                case 1:
-        running = false;
+                    action = "Running";
-        finished = true;
+                    break;
-
+                case 2:
-        deleteThisFromFile();
+                    action = "Completed";
-
+                    break;
-        for (WeakReference<MissionListener> ref : mListeners) {
+                default:
-            final MissionListener listener = ref.get();
+                    action = "Failed";
-            if (listener != null) {
-                MissionListener.handlerStore.get(listener).post(new Runnable() {
-                    @Override
-                    public void run() {
-                        listener.onFinish(DownloadMission.this);
-                    }
-                });
             }
+
+            Log.d(TAG, action + " postprocessing on " + location + File.separator + name);
         }
-    }
 
-    public synchronized void notifyError(int err) {
+        synchronized (blockState) {
-        errCode = err;
+            // don't return without fully write the current state
-
+            postprocessingState = state;
-        writeThisToFile();
+            Utility.writeToFile(metadata, DownloadMission.this);
-
-        for (WeakReference<MissionListener> ref : mListeners) {
-            final MissionListener listener = ref.get();
-            MissionListener.handlerStore.get(listener).post(new Runnable() {
-                @Override
-                public void run() {
-                    listener.onError(DownloadMission.this, errCode);
-                }
-            });
-        }
-    }
-
-    public synchronized void addListener(MissionListener listener) {
-        Handler handler = new Handler(Looper.getMainLooper());
-        MissionListener.handlerStore.put(listener, handler);
-        mListeners.add(new WeakReference<>(listener));
-    }
-
-    public synchronized void removeListener(MissionListener listener) {
-        for (Iterator<WeakReference<MissionListener>> iterator = mListeners.iterator();
-             iterator.hasNext(); ) {
-            WeakReference<MissionListener> weakRef = iterator.next();
-            if (listener != null && listener == weakRef.get()) {
-                iterator.remove();
-            }
         }
     }
 
@@ -249,92 +413,303 @@ public class DownloadMission implements Serializable {
      * Start downloading with multiple threads.
      */
     public void start() {
-        if (!running && !finished) {
+        if (running || isFinished()) return;
-            running = true;
 
-            if (!fallback) {
+        // ensure that the previous state is completely paused.
-                for (int i = 0; i < threadCount; i++) {
+        joinForThread(init);
-                    if (threadPositions.size() <= i && !recovered) {
+        if (threads != null)
-                        threadPositions.add((long) i);
+            for (Thread thread : threads) joinForThread(thread);
-                    }
+
-                    new Thread(new DownloadRunnable(this, i)).start();
+        enqueued = false;
+        running = true;
+        errCode = ERROR_NOTHING;
+
+        if (current >= urls.length && postprocessingName != null) {
+            runAsync(1, () -> {
+                if (doPostprocessing()) {
+                    running = false;
+                    deleteThisFromFile();
+
+                    notify(DownloadManagerService.MESSAGE_FINISHED);
                 }
-            } else {
+            });
-                // In fallback mode, resuming is not supported.
+
-                threadCount = 1;
+            return;
+        }
+
+        if (blocks < 0) {
+            initializer();
+            return;
+        }
+
+        init = null;
+
+        if (threads == null || threads.length < 1) {
+            threads = new Thread[currentThreadCount];
+        }
+
+        if (fallback) {
+            if (unknownLength) {
                 done = 0;
-                blocks = 0;
+                length = 0;
-                new Thread(new DownloadRunnableFallback(this)).start();
+            }
+
+            threads[0] = runAsync(1, new DownloadRunnableFallback(this));
+        } else {
+            for (int i = 0; i < currentThreadCount; i++) {
+                threads[i] = runAsync(i + 1, new DownloadRunnable(this, i));
             }
         }
     }
 
-    public void pause() {
+    /**
-        if (running) {
+     * Pause the mission, does not affect the blocks that are being downloaded.
-            running = false;
+     */
-            recovered = true;
+    public synchronized void pause() {
+        if (!running) return;
 
-            // TODO: Notify & Write state to info file
+        if (isPsRunning()) {
-            // if (err)
+            if (DEBUG) {
+                Log.w(TAG, "pause during post-processing is not applicable.");
+            }
+            return;
         }
+
+        running = false;
+        recovered = true;
+        enqueued = false;
+
+        if (init != null && Thread.currentThread() != init && init.isAlive()) {
+            init.interrupt();
+            synchronized (blockState) {
+                resetState();
+            }
+            return;
+        }
+
+        if (DEBUG && blocks == 0) {
+            Log.w(TAG, "pausing a download that can not be resumed (range requests not allowed by the server).");
+        }
+
+        if (threads == null || Thread.currentThread().isInterrupted()) {
+            writeThisToFile();
+            return;
+        }
+
+        // wait for all threads are suspended before save the state
+        runAsync(-1, () -> {
+            try {
+                for (Thread thread : threads) {
+                    if (thread.isAlive()) {
+                        thread.interrupt();
+                        thread.join(5000);
+                    }
+                }
+            } catch (Exception e) {
+                // nothing to do
+            } finally {
+                writeThisToFile();
+            }
+        });
     }
 
     /**
      * Removes the file and the meta file
      */
-    public void delete() {
+    @Override
-        deleteThisFromFile();
+    public boolean delete() {
-        new File(location, name).delete();
+        deleted = true;
+        boolean res = deleteThisFromFile();
+        if (!super.delete()) res = false;
+        return res;
+    }
+
+    void resetState() {
+        done = 0;
+        blocks = -1;
+        errCode = ERROR_NOTHING;
+        fallback = false;
+        unknownLength = false;
+        finishCount = 0;
+        threadBlockPositions.clear();
+        threadBytePositions.clear();
+        blockState.clear();
+        threads = new Thread[0];
+
+        Utility.writeToFile(metadata, DownloadMission.this);
+    }
+
+    private void initializer() {
+        init = runAsync(DownloadInitializer.mId, new DownloadInitializer(this));
+
     }
 
     /**
      * Write this {@link DownloadMission} to the meta file asynchronously
      * if no thread is already running.
      */
-    public void writeThisToFile() {
+    private void writeThisToFile() {
-        if (!mWritingToFile) {
-            mWritingToFile = true;
-            new Thread() {
-                @Override
-                public void run() {
-                    doWriteThisToFile();
-                    mWritingToFile = false;
-                }
-            }.start();
-        }
-    }
-
-    /**
-     * Write this {@link DownloadMission} to the meta file.
-     */
-    private void doWriteThisToFile() {
         synchronized (blockState) {
-            Utility.writeToFile(getMetaFilename(), this);
+            if (deleted) return;
+            Utility.writeToFile(metadata, DownloadMission.this);
         }
-    }
+        mWritingToFile = false;
-
-    private void readObject(ObjectInputStream inputStream)
-    throws java.io.IOException, ClassNotFoundException
-    {
-        inputStream.defaultReadObject();
-        mListeners = new ArrayList<>();
-    }
-
-    private void deleteThisFromFile() {
-        new File(getMetaFilename()).delete();
     }
 
     /**
-     * Get the path of the meta file
+     * Indicates if the download if fully finished
      *
-     * @return the path to the meta file
+     * @return true, otherwise, false
      */
-    private String getMetaFilename() {
+    public boolean isFinished() {
-        return location + "/" + name + ".giga";
+        return current >= urls.length && (postprocessingName == null || postprocessingState == 2);
     }
 
-    public File getDownloadedFile() {
+    /**
-        return new File(location, name);
+     * Indicates if the download file is corrupt due a failed post-processing
+     *
+     * @return {@code true} if this mission is unrecoverable
+     */
+    public boolean isPsFailed() {
+        return postprocessingName != null && errCode == DownloadMission.ERROR_POSTPROCESSING && postprocessingThis;
     }
 
+    /**
+     * Indicates if a post-processing algorithm is running
+     *
+     * @return true, otherwise, false
+     */
+    public boolean isPsRunning() {
+        return postprocessingName != null && postprocessingState == 1;
+    }
+
+    public long getLength() {
+        long calculated;
+        if (postprocessingState == 1) {
+            calculated = length;
+        } else {
+            calculated = offsets[current < offsets.length ? current : (offsets.length - 1)] + length;
+        }
+
+        calculated -= offsets[0];// don't count reserved space
+
+        return calculated > nearLength ? calculated : nearLength;
+    }
+
+    private boolean doPostprocessing() {
+        if (postprocessingName == null || postprocessingState == 2) return true;
+
+        notifyPostProcessing(1);
+        notifyProgress(0);
+
+        Thread.currentThread().setName("[" + TAG + "]  post-processing = " + postprocessingName + "  filename = " + name);
+
+        Exception exception = null;
+
+        try {
+            Postprocessing
+                    .getAlgorithm(postprocessingName, this)
+                    .run();
+        } catch (Exception err) {
+            StringBuilder args = new StringBuilder("  ");
+            if (postprocessingArgs != null) {
+                for (String arg : postprocessingArgs) {
+                    args.append(", ");
+                    args.append(arg);
+                }
+                args.delete(0, 1);
+            }
+            Log.e(TAG, String.format("Post-processing failed. algorithm = %s  args = [%s]", postprocessingName, args), err);
+
+            if (errCode == ERROR_NOTHING) errCode = ERROR_POSTPROCESSING;
+
+            exception = err;
+        } finally {
+            notifyPostProcessing(errCode == ERROR_NOTHING ? 2 : 0);
+        }
+
+        if (errCode != ERROR_NOTHING) {
+            if (exception == null) exception = errObject;
+            notifyError(ERROR_POSTPROCESSING, exception);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean deleteThisFromFile() {
+        synchronized (blockState) {
+            return metadata.delete();
+        }
+    }
+
+    /**
+     * run a new thread
+     *
+     * @param id  id of new thread (used for debugging only)
+     * @param who the Runnable whose {@code run} method is invoked.
+     */
+    private void runAsync(int id, Runnable who) {
+        runAsync(id, new Thread(who));
+    }
+
+    /**
+     * run a new thread
+     *
+     * @param id  id of new thread (used for debugging only)
+     * @param who the Thread whose {@code run} method is invoked when this thread is started
+     * @return the passed thread
+     */
+    private Thread runAsync(int id, Thread who) {
+        // known thread ids:
+        //   -2:     state saving by  notifyProgress()  method
+        //   -1:     wait for saving the state by  pause()  method
+        //    0:     initializer
+        //  >=1:     any download thread
+
+        if (DEBUG) {
+            who.setName(String.format("%s[%s] %s", TAG, id, name));
+        }
+
+        who.start();
+
+        return who;
+    }
+
+    private void joinForThread(Thread thread) {
+        if (thread == null || !thread.isAlive()) return;
+        if (thread == Thread.currentThread()) return;
+
+        if (DEBUG) {
+            Log.w(TAG, "a thread is !still alive!: " + thread.getName());
+        }
+
+        // still alive, this should not happen.
+        // Possible reasons:
+        //      slow device
+        //      the user is spamming start/pause buttons
+        //      start() method called quickly after pause()
+
+        try {
+            thread.join(10000);
+        } catch (InterruptedException e) {
+            Log.d(TAG, "timeout on join : " + thread.getName());
+            throw new RuntimeException("A thread is still running:\n" + thread.getName());
+        }
+    }
+
+
+    static class HttpError extends Exception {
+        int statusCode;
+
+        HttpError(int statusCode) {
+            this.statusCode = statusCode;
+        }
+
+        @Override
+        public String getMessage() {
+            return "HTTP " + String.valueOf(statusCode);
+        }
+    }
 }

app/src/main/java/us/shandian/giga/get/DownloadRunnable.java

@@ -2,9 +2,11 @@ package us.shandian.giga.get;
 
 import android.util.Log;
 
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.nio.channels.ClosedByInterruptException;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
@@ -12,142 +14,166 @@ import static org.schabi.newpipe.BuildConfig.DEBUG;
  * Runnable to download blocks of a file until the file is completely downloaded,
  * an error occurs or the process is stopped.
  */
-public class DownloadRunnable implements Runnable {
+public class DownloadRunnable extends Thread {
     private static final String TAG = DownloadRunnable.class.getSimpleName();
 
     private final DownloadMission mMission;
     private final int mId;
 
-    public DownloadRunnable(DownloadMission mission, int id) {
+    private HttpURLConnection mConn;
+
+    DownloadRunnable(DownloadMission mission, int id) {
         if (mission == null) throw new NullPointerException("mission is null");
         mMission = mission;
         mId = id;
+        mConn = null;
     }
 
     @Override
     public void run() {
         boolean retry = mMission.recovered;
-        long position = mMission.getPosition(mId);
+        long blockPosition = mMission.getBlockPosition(mId);
+        int retryCount = 0;
 
         if (DEBUG) {
-            Log.d(TAG, mId + ":default pos " + position);
+            Log.d(TAG, mId + ":default pos " + blockPosition);
             Log.d(TAG, mId + ":recovered: " + mMission.recovered);
         }
 
-        while (mMission.errCode == -1 && mMission.running && position < mMission.blocks) {
+        RandomAccessFile f;
+        InputStream is = null;
 
-            if (Thread.currentThread().isInterrupted()) {
+        try {
-                mMission.pause();
+            f = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
-                return;
+        } catch (FileNotFoundException e) {
-            }
+            mMission.notifyError(e);// this never should happen
+            return;
+        }
+
+        while (mMission.running && mMission.errCode == DownloadMission.ERROR_NOTHING && blockPosition < mMission.blocks) {
 
             if (DEBUG && retry) {
-                Log.d(TAG, mId + ":retry is true. Resuming at " + position);
+                Log.d(TAG, mId + ":retry is true. Resuming at " + blockPosition);
             }
 
             // Wait for an unblocked position
-            while (!retry && position < mMission.blocks && mMission.isBlockPreserved(position)) {
+            while (!retry && blockPosition < mMission.blocks && mMission.isBlockPreserved(blockPosition)) {
 
                 if (DEBUG) {
-                    Log.d(TAG, mId + ":position " + position + " preserved, passing");
+                    Log.d(TAG, mId + ":position " + blockPosition + " preserved, passing");
                 }
 
-                position++;
+                blockPosition++;
             }
 
             retry = false;
 
-            if (position >= mMission.blocks) {
+            if (blockPosition >= mMission.blocks) {
                 break;
             }
 
             if (DEBUG) {
-                Log.d(TAG, mId + ":preserving position " + position);
+                Log.d(TAG, mId + ":preserving position " + blockPosition);
             }
 
-            mMission.preserveBlock(position);
+            mMission.preserveBlock(blockPosition);
-            mMission.setPosition(mId, position);
+            mMission.setBlockPosition(mId, blockPosition);
 
-            long start = position * DownloadManager.BLOCK_SIZE;
+            long start = blockPosition * DownloadMission.BLOCK_SIZE;
-            long end = start + DownloadManager.BLOCK_SIZE - 1;
+            long end = start + DownloadMission.BLOCK_SIZE - 1;
+            long offset = mMission.getThreadBytePosition(mId);
+
+            start += offset;
 
             if (end >= mMission.length) {
                 end = mMission.length - 1;
             }
 
-            HttpURLConnection conn = null;
+            long total = 0;
-
-            int total = 0;
 
             try {
-                URL url = new URL(mMission.url);
+                mConn = mMission.openConnection(mId, start, end);
-                conn = (HttpURLConnection) url.openConnection();
+                mMission.establishConnection(mId, mConn);
-                conn.setRequestProperty("Range", "bytes=" + start + "-" + end);
 
-                if (DEBUG) {
+                // check if the download can be resumed
-                    Log.d(TAG, mId + ":" + conn.getRequestProperty("Range"));
+                if (mConn.getResponseCode() == 416 && offset > 0) {
-                    Log.d(TAG, mId + ":Content-Length=" + conn.getContentLength() + " Code:" + conn.getResponseCode());
+                    retryCount--;
+                    throw new DownloadMission.HttpError(416);
                 }
 
-                // A server may be ignoring the range request
+                // The server may be ignoring the range request
-                if (conn.getResponseCode() != 206) {
+                if (mConn.getResponseCode() != 206) {
-                    mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
+                    mMission.notifyError(new DownloadMission.HttpError(mConn.getResponseCode()));
-                    notifyError();
 
                     if (DEBUG) {
-                        Log.e(TAG, mId + ":Unsupported " + conn.getResponseCode());
+                        Log.e(TAG, mId + ":Unsupported " + mConn.getResponseCode());
                     }
 
                     break;
                 }
 
-                RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
+                f.seek(mMission.offsets[mMission.current] + start);
-                f.seek(start);
-                java.io.InputStream ipt = conn.getInputStream();
-                byte[] buf = new byte[64*1024];
 
-                while (start < end && mMission.running) {
+                is = mConn.getInputStream();
-                    int len = ipt.read(buf, 0, buf.length);
 
-                    if (len == -1) {
+                byte[] buf = new byte[DownloadMission.BUFFER_SIZE];
-                        break;
+                int len;
-                    } else {
+
-                        start += len;
+                while (start < end && mMission.running && (len = is.read(buf, 0, buf.length)) != -1) {
-                        total += len;
+                    f.write(buf, 0, len);
-                        f.write(buf, 0, len);
+                    start += len;
-                        notifyProgress(len);
+                    total += len;
-                    }
+                    mMission.notifyProgress(len);
                 }
 
                 if (DEBUG && mMission.running) {
-                    Log.d(TAG, mId + ":position " + position + " finished, total length " + total);
+                    Log.d(TAG, mId + ":position " + blockPosition + " finished, " + total + " bytes downloaded");
                 }
 
-                f.close();
+                if (mMission.running)
-                ipt.close();
+                    mMission.setThreadBytePosition(mId, 0L);// clear byte position for next block
+                else
+                    mMission.setThreadBytePosition(mId, total);// download paused, save progress for this block
 
-                // TODO We should save progress for each thread
             } catch (Exception e) {
-                // TODO Retry count limit & notify error
+                mMission.setThreadBytePosition(mId, total);
-                retry = true;
 
-                notifyProgress(-total);
+                if (!mMission.running || e instanceof ClosedByInterruptException) break;
+
+                if (retryCount++ >= mMission.maxRetry) {
+                    mMission.notifyError(e);
+                    break;
+                }
 
                 if (DEBUG) {
-                    Log.d(TAG, mId + ":position " + position + " retrying", e);
+                    Log.d(TAG, mId + ":position " + blockPosition + " retrying due exception", e);
                 }
+
+                retry = true;
             }
         }
 
+        try {
+            if (is != null) is.close();
+        } catch (Exception err) {
+            // nothing to do
+        }
+
+        try {
+            f.close();
+        } catch (Exception err) {
+            // ¿ejected media storage?  ¿file deleted?  ¿storage ran out of space?
+        }
+
         if (DEBUG) {
-            Log.d(TAG, "thread " + mId + " exited main loop");
+            Log.d(TAG, "thread " + mId + " exited from main download loop");
         }
 
-        if (mMission.errCode == -1 && mMission.running) {
+        if (mMission.errCode == DownloadMission.ERROR_NOTHING && mMission.running) {
             if (DEBUG) {
                 Log.d(TAG, "no error has happened, notifying");
             }
-            notifyFinished();
+            mMission.notifyFinished();
         }
 
         if (DEBUG && !mMission.running) {
@@ -155,22 +181,15 @@ public class DownloadRunnable implements Runnable {
         }
     }
 
-    private void notifyProgress(final long len) {
+    @Override
-        synchronized (mMission) {
+    public void interrupt() {
-            mMission.notifyProgress(len);
+        super.interrupt();
+
+        try {
+            if (mConn != null) mConn.disconnect();
+        } catch (Exception e) {
+            // nothing to do
         }
     }
 
-    private void notifyError() {
-        synchronized (mMission) {
-            mMission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
-            mMission.pause();
-        }
-    }
-
-    private void notifyFinished() {
-        synchronized (mMission) {
-            mMission.notifyFinished();
-        }
-    }
 }

app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java

@@ -1,74 +1,139 @@
 package us.shandian.giga.get;
 
-import java.io.BufferedInputStream;
+import android.annotation.SuppressLint;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
-import java.net.URL;
+import java.nio.channels.ClosedByInterruptException;
+
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+/**
+ * Single-threaded fallback mode
+ */
+public class DownloadRunnableFallback extends Thread {
+    private static final String TAG = "DownloadRunnableFallback";
 
-// Single-threaded fallback mode
-public class DownloadRunnableFallback implements Runnable {
     private final DownloadMission mMission;
-    //private int mId;
+    private final int mId = 1;
 
-    public DownloadRunnableFallback(DownloadMission mission) {
+    private int mRetryCount = 0;
-        if (mission == null) throw new NullPointerException("mission is null");
+    private InputStream mIs;
-        //mId = id;
+    private RandomAccessFile mF;
+    private HttpURLConnection mConn;
+
+    DownloadRunnableFallback(@NonNull DownloadMission mission) {
         mMission = mission;
+        mIs = null;
+        mF = null;
+        mConn = null;
+    }
+
+    private void dispose() {
+        try {
+            if (mIs != null) mIs.close();
+        } catch (IOException e) {
+            // nothing to do
+        }
+
+        try {
+            if (mF != null) mF.close();
+        } catch (IOException e) {
+            // ¿ejected media storage? ¿file deleted? ¿storage ran out of space?
+        }
     }
 
     @Override
+    @SuppressLint("LongLogTag")
     public void run() {
-        try {
+        boolean done;
-            URL url = new URL(mMission.url);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
 
-            if (conn.getResponseCode() != 200 && conn.getResponseCode() != 206) {
+        long start = 0;
-                notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
-            } else {
-                RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
-                f.seek(0);
-                BufferedInputStream ipt = new BufferedInputStream(conn.getInputStream());
-                byte[] buf = new byte[512];
-                int len = 0;
 
-                while ((len = ipt.read(buf, 0, 512)) != -1 && mMission.running) {
+        if (!mMission.unknownLength) {
-                    f.write(buf, 0, len);
+            start = mMission.getThreadBytePosition(0);
-                    notifyProgress(len);
+            if (DEBUG && start > 0) {
-
+                Log.i(TAG, "Resuming a single-thread download at " + start);
-                    if (Thread.interrupted()) {
-                        break;
-                    }
-
-                }
-
-                f.close();
-                ipt.close();
             }
+        }
+
+        try {
+            long rangeStart = (mMission.unknownLength || start < 1) ? -1 : start;
+
+            mConn = mMission.openConnection(mId, rangeStart, -1);
+            mMission.establishConnection(mId, mConn);
+
+            // check if the download can be resumed
+            if (mConn.getResponseCode() == 416 && start > 0) {
+                start = 0;
+                mRetryCount--;
+                throw new DownloadMission.HttpError(416);
+            }
+
+            // secondary check for the file length
+            if (!mMission.unknownLength)
+                mMission.unknownLength = Utility.getContentLength(mConn) == -1;
+
+            mF = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
+            mF.seek(mMission.offsets[mMission.current] + start);
+
+            mIs = mConn.getInputStream();
+
+            byte[] buf = new byte[64 * 1024];
+            int len = 0;
+
+            while (mMission.running && (len = mIs.read(buf, 0, buf.length)) != -1) {
+                mF.write(buf, 0, len);
+                start += len;
+                mMission.notifyProgress(len);
+            }
+
+            // if thread goes interrupted check if the last part mIs written. This avoid re-download the whole file
+            done = len == -1;
         } catch (Exception e) {
-            notifyError(DownloadMission.ERROR_UNKNOWN);
+            dispose();
+
+            // save position
+            mMission.setThreadBytePosition(0, start);
+
+            if (!mMission.running || e instanceof ClosedByInterruptException) return;
+
+            if (mRetryCount++ >= mMission.maxRetry) {
+                mMission.notifyError(e);
+                return;
+            }
+
+            run();// try again
+            return;
         }
 
-        if (mMission.errCode == -1 && mMission.running) {
+        dispose();
-            notifyFinished();
-        }
-    }
 
-    private void notifyProgress(final long len) {
+        if (done) {
-        synchronized (mMission) {
-            mMission.notifyProgress(len);
-        }
-    }
-
-    private void notifyError(final int err) {
-        synchronized (mMission) {
-            mMission.notifyError(err);
-            mMission.pause();
-        }
-    }
-
-    private void notifyFinished() {
-        synchronized (mMission) {
             mMission.notifyFinished();
+        } else {
+            mMission.setThreadBytePosition(0, start);
+        }
+    }
+
+    @Override
+    public void interrupt() {
+        super.interrupt();
+
+        if (mConn != null) {
+            try {
+                mConn.disconnect();
+            } catch (Exception e) {
+                // nothing to do
+            }
+
         }
     }
 }

app/src/main/java/us/shandian/giga/get/FinishedMission.java

@@ -0,0 +1,16 @@
+package us.shandian.giga.get;
+
+public class FinishedMission extends  Mission {
+
+    public FinishedMission() {
+    }
+
+    public FinishedMission(DownloadMission mission) {
+        source = mission.source;
+        length = mission.length;// ¿or mission.done?
+        timestamp = mission.timestamp;
+        name = mission.name;
+        location = mission.location;
+        kind = mission.kind;
+    }
+}

app/src/main/java/us/shandian/giga/get/Mission.java

@@ -0,0 +1,66 @@
+package us.shandian.giga.get;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public abstract class Mission implements Serializable {
+    private static final long serialVersionUID = 0L;// last bump: 5 october 2018
+
+    /**
+     * Source url of the resource
+     */
+    public String source;
+
+    /**
+     * Length of the current resource
+     */
+    public long length;
+
+    /**
+     * creation timestamp (and maybe unique identifier)
+     */
+    public long timestamp;
+
+    /**
+     * The filename
+     */
+    public String name;
+
+    /**
+     * The directory to store the download
+     */
+    public String location;
+
+    /**
+     * pre-defined content type
+     */
+    public char kind;
+
+    /**
+     * get the target file on the storage
+     *
+     * @return File object
+     */
+    public File getDownloadedFile() {
+        return new File(location, name);
+    }
+
+    public boolean delete() {
+        deleted = true;
+        return getDownloadedFile().delete();
+    }
+
+    /**
+     * Indicate if this mission is deleted whatever is stored
+     */
+    public transient boolean deleted = false;
+
+    @Override
+    public String toString() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(timestamp);
+        return "[" + calendar.getTime().toString() + "] " + location + File.separator + name;
+    }
+}

app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java

@@ -0,0 +1,73 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_LOCATION;
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_NAME;
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.MISSIONS_TABLE_NAME;
+
+public class DownloadDataSource {
+
+    private static final String TAG = "DownloadDataSource";
+    private final DownloadMissionHelper downloadMissionHelper;
+
+    public DownloadDataSource(Context context) {
+        downloadMissionHelper = new DownloadMissionHelper(context);
+    }
+
+    public ArrayList<FinishedMission> loadFinishedMissions() {
+        SQLiteDatabase database = downloadMissionHelper.getReadableDatabase();
+        Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
+                null, null, null, DownloadMissionHelper.KEY_TIMESTAMP);
+
+        int count = cursor.getCount();
+        if (count == 0) return new ArrayList<>(1);
+
+        ArrayList<FinishedMission> result = new ArrayList<>(count);
+        while (cursor.moveToNext()) {
+            result.add(DownloadMissionHelper.getMissionFromCursor(cursor));
+        }
+
+        return result;
+    }
+
+    public void addMission(DownloadMission downloadMission) {
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
+        database.insert(MISSIONS_TABLE_NAME, null, values);
+    }
+
+    public void deleteMission(Mission downloadMission) {
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+        database.delete(MISSIONS_TABLE_NAME,
+                KEY_LOCATION + " = ? AND " +
+                        KEY_NAME + " = ?",
+                new String[]{downloadMission.location, downloadMission.name});
+    }
+
+    public void updateMission(DownloadMission downloadMission) {
+        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
+        String whereClause = KEY_LOCATION + " = ? AND " +
+                KEY_NAME + " = ?";
+        int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
+                whereClause, new String[]{downloadMission.location, downloadMission.name});
+        if (rowsAffected != 1) {
+            Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
+        }
+    }
+}

app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java

@@ -7,19 +7,19 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
 
 /**
- * SqliteHelper to store {@link us.shandian.giga.get.DownloadMission}
+ * SQLiteHelper to store finished {@link us.shandian.giga.get.DownloadMission}'s
  */
-public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
+public class DownloadMissionHelper extends SQLiteOpenHelper {
-
-
     private final String TAG = "DownloadMissionHelper";
 
     // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
     private static final String DATABASE_NAME = "downloads.db";
 
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 3;
+
     /**
      * The table name of download missions
      */
@@ -30,9 +30,9 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
      */
     static final String KEY_LOCATION = "location";
     /**
-     * The key to the url of a mission
+     * The key to the urls of a mission
      */
-    static final String KEY_URL = "url";
+    static final String KEY_SOURCE_URL = "url";
     /**
      * The key to the name of a mission
      */
@@ -45,6 +45,8 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
 
     static final String KEY_TIMESTAMP = "timestamp";
 
+    static  final String KEY_KIND = "kind";
+
     /**
      * The statement to create the table
      */
@@ -52,16 +54,28 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
             "CREATE TABLE " + MISSIONS_TABLE_NAME + " (" +
                     KEY_LOCATION + " TEXT NOT NULL, " +
                     KEY_NAME + " TEXT NOT NULL, " +
-                    KEY_URL + " TEXT NOT NULL, " +
+                    KEY_SOURCE_URL + " TEXT NOT NULL, " +
                     KEY_DONE + " INTEGER NOT NULL, " +
                     KEY_TIMESTAMP + " INTEGER NOT NULL, " +
+                    KEY_KIND + " TEXT NOT NULL, " +
                     " UNIQUE(" + KEY_LOCATION + ", " + KEY_NAME + "));";
 
-
+    public DownloadMissionHelper(Context context) {
-    DownloadMissionSQLiteHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(MISSIONS_CREATE_TABLE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion == 2) {
+            db.execSQL("ALTER TABLE " + MISSIONS_TABLE_NAME + " ADD COLUMN " + KEY_KIND + " TEXT;");
+        }
+    }
+
     /**
      * Returns all values of the download mission as ContentValues.
      *
@@ -70,34 +84,29 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
      */
     public static ContentValues getValuesOfMission(DownloadMission downloadMission) {
         ContentValues values = new ContentValues();
-        values.put(KEY_URL, downloadMission.url);
+        values.put(KEY_SOURCE_URL, downloadMission.source);
         values.put(KEY_LOCATION, downloadMission.location);
         values.put(KEY_NAME, downloadMission.name);
         values.put(KEY_DONE, downloadMission.done);
         values.put(KEY_TIMESTAMP, downloadMission.timestamp);
+        values.put(KEY_KIND, String.valueOf(downloadMission.kind));
         return values;
     }
 
-    @Override
+    public static FinishedMission getMissionFromCursor(Cursor cursor) {
-    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(MISSIONS_CREATE_TABLE);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        // Currently nothing to do
-    }
-
-    public static DownloadMission getMissionFromCursor(Cursor cursor) {
         if (cursor == null) throw new NullPointerException("cursor is null");
-        int pos;
+
-        String name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
+        String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
-        String location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
+        if (kind == null || kind.isEmpty()) kind = "?";
-        String url = cursor.getString(cursor.getColumnIndexOrThrow(KEY_URL));
+
-        DownloadMission mission = new DownloadMission(name, url, location);
+        FinishedMission mission = new FinishedMission();
-        mission.done = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
+        mission.name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
+        mission.location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
+        mission.source = cursor.getString(cursor.getColumnIndexOrThrow(KEY_SOURCE_URL));;
+        mission.length = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
         mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
-        mission.finished = true;
+        mission.kind = kind.charAt(0);
+
         return mission;
     }
 }

app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java

@@ -1,79 +0,0 @@
-package us.shandian.giga.get.sqlite;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import us.shandian.giga.get.DownloadDataSource;
-import us.shandian.giga.get.DownloadMission;
-
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_LOCATION;
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_NAME;
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.MISSIONS_TABLE_NAME;
-
-
-/**
- * Non-thread-safe implementation of {@link DownloadDataSource}
- */
-public class SQLiteDownloadDataSource implements DownloadDataSource {
-
-    private static final String TAG = "DownloadDataSourceImpl";
-    private final DownloadMissionSQLiteHelper downloadMissionSQLiteHelper;
-
-    public SQLiteDownloadDataSource(Context context) {
-        downloadMissionSQLiteHelper = new DownloadMissionSQLiteHelper(context);
-    }
-
-    @Override
-    public List<DownloadMission> loadMissions() {
-        ArrayList<DownloadMission> result;
-        SQLiteDatabase database = downloadMissionSQLiteHelper.getReadableDatabase();
-        Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
-                null, null, null, DownloadMissionSQLiteHelper.KEY_TIMESTAMP);
-
-        int count = cursor.getCount();
-        if (count == 0) return new ArrayList<>();
-        result = new ArrayList<>(count);
-        while (cursor.moveToNext()) {
-            result.add(DownloadMissionSQLiteHelper.getMissionFromCursor(cursor));
-        }
-        return result;
-    }
-
-    @Override
-    public void addMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
-        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
-        database.insert(MISSIONS_TABLE_NAME, null, values);
-    }
-
-    @Override
-    public void updateMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
-        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
-        String whereClause = KEY_LOCATION + " = ? AND " +
-                KEY_NAME + " = ?";
-        int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
-                whereClause, new String[]{downloadMission.location, downloadMission.name});
-        if (rowsAffected != 1) {
-            Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
-        }
-    }
-
-    @Override
-    public void deleteMission(DownloadMission downloadMission) {
-        if (downloadMission == null) throw new NullPointerException("downloadMission is null");
-        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
-        database.delete(MISSIONS_TABLE_NAME,
-                KEY_LOCATION + " = ? AND " +
-                        KEY_NAME + " = ?",
-                new String[]{downloadMission.location, downloadMission.name});
-    }
-}

app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java

@@ -0,0 +1,29 @@
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.Mp4DashWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * @author kapodamy
+ */
+class Mp4DashMuxer extends Postprocessing {
+
+    Mp4DashMuxer(DownloadMission mission) {
+        super(mission, 15360 * 1024/* 15 MiB */, true);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        Mp4DashWriter muxer = new Mp4DashWriter(sources);
+        muxer.parseSources();
+        muxer.selectTracks(0, 0);
+        muxer.build(out);
+
+        return OK_RESULT;
+    }
+
+}

app/src/main/java/us/shandian/giga/postprocessing/Mp4Muxer.java

@@ -0,0 +1,136 @@
+package us.shandian.giga.postprocessing;
+
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaExtractor;
+import android.media.MediaMuxer;
+import android.media.MediaMuxer.OutputFormat;
+import android.util.Log;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import us.shandian.giga.get.DownloadMission;
+
+
+class Mp4Muxer extends Postprocessing {
+    private static final String TAG = "Mp4Muxer";
+    private static final int NOTIFY_BYTES_INTERVAL = 128 * 1024;// 128 KiB
+
+    Mp4Muxer(DownloadMission mission) {
+        super(mission, 0, false);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        File dlFile = mission.getDownloadedFile();
+        File tmpFile = new File(mission.location, mission.name.concat(".tmp"));
+
+        if (tmpFile.exists())
+            if (!tmpFile.delete()) return DownloadMission.ERROR_FILE_CREATION;
+
+        if (!tmpFile.createNewFile()) return DownloadMission.ERROR_FILE_CREATION;
+
+        FileInputStream source = null;
+        MediaMuxer muxer = null;
+
+        //noinspection TryFinallyCanBeTryWithResources
+        try {
+            source = new FileInputStream(dlFile);
+            MediaExtractor tracks[] = {
+                    getMediaExtractor(source, mission.offsets[0], mission.offsets[1] - mission.offsets[0]),
+                    getMediaExtractor(source, mission.offsets[1], mission.length - mission.offsets[1])
+            };
+
+            muxer = new MediaMuxer(tmpFile.getAbsolutePath(), OutputFormat.MUXER_OUTPUT_MPEG_4);
+
+            int tracksIndex[] = {
+                    muxer.addTrack(tracks[0].getTrackFormat(0)),
+                    muxer.addTrack(tracks[1].getTrackFormat(0))
+            };
+
+            ByteBuffer buffer = ByteBuffer.allocate(512 * 1024);// 512 KiB
+            BufferInfo info = new BufferInfo();
+
+            long written = 0;
+            long nextReport = NOTIFY_BYTES_INTERVAL;
+
+            muxer.start();
+
+            while (true) {
+                int done = 0;
+
+                for (int i = 0; i < tracks.length; i++) {
+                    if (tracksIndex[i] < 0) continue;
+
+                    info.set(0,
+                            tracks[i].readSampleData(buffer, 0),
+                            tracks[i].getSampleTime(),
+                            tracks[i].getSampleFlags()
+                    );
+
+                    if (info.size >= 0) {
+                        muxer.writeSampleData(tracksIndex[i], buffer, info);
+                        written += info.size;
+                        done++;
+                    }
+                    if (!tracks[i].advance()) {
+                        // EOF reached
+                        tracks[i].release();
+                        tracksIndex[i] = -1;
+                    }
+
+                    if (written > nextReport) {
+                        nextReport = written + NOTIFY_BYTES_INTERVAL;
+                        super.progressReport(written);
+                    }
+                }
+
+                if (done < 1) break;
+            }
+
+            // this part should not fail
+            if (!dlFile.delete()) return DownloadMission.ERROR_FILE_CREATION;
+            if (!tmpFile.renameTo(dlFile)) return DownloadMission.ERROR_FILE_CREATION;
+
+            return OK_RESULT;
+        } finally {
+            try {
+                if (muxer != null) {
+                    muxer.stop();
+                    muxer.release();
+                }
+            } catch (Exception err) {
+                if (DEBUG)
+                    Log.e(TAG, "muxer stop/release failed", err);
+            }
+
+            if (source != null) {
+                try {
+                    source.close();
+                } catch (IOException e) {
+                    // nothing to do
+                }
+            }
+
+            // if the operation fails, delete the temporal file
+            if (tmpFile.exists()) {
+                //noinspection ResultOfMethodCallIgnored
+                tmpFile.delete();
+            }
+        }
+    }
+
+    private MediaExtractor getMediaExtractor(FileInputStream source, long offset, long length) throws IOException {
+        MediaExtractor extractor = new MediaExtractor();
+        extractor.setDataSource(source.getFD(), offset, length);
+        extractor.selectTrack(0);
+
+        return extractor;
+    }
+}

app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java

@@ -0,0 +1,164 @@
+package us.shandian.giga.postprocessing;
+
+import android.os.Message;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.postprocessing.io.ChunkFileInputStream;
+import us.shandian.giga.postprocessing.io.CircularFile;
+import us.shandian.giga.service.DownloadManagerService;
+
+public abstract class Postprocessing {
+
+    static final byte OK_RESULT = DownloadMission.ERROR_NOTHING;
+
+    public static final String ALGORITHM_TTML_CONVERTER = "ttml";
+    public static final String ALGORITHM_MP4_DASH_MUXER = "mp4D";
+    public static final String ALGORITHM_MP4_MUXER = "mp4";
+    public static final String ALGORITHM_WEBM_MUXER = "webm";
+
+    public static Postprocessing getAlgorithm(String algorithmName, DownloadMission mission) {
+        if (null == algorithmName) {
+            throw new NullPointerException("algorithmName");
+        } else switch (algorithmName) {
+            case ALGORITHM_TTML_CONVERTER:
+                return new TtmlConverter(mission);
+            case ALGORITHM_MP4_DASH_MUXER:
+                return new Mp4DashMuxer(mission);
+            case ALGORITHM_MP4_MUXER:
+                return new Mp4Muxer(mission);
+            case ALGORITHM_WEBM_MUXER:
+                return new WebMMuxer(mission);
+            /*case "example-algorithm":
+            return new ExampleAlgorithm(mission);*/
+            default:
+                throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
+        }
+    }
+
+    /**
+     * Get a boolean value that indicate if the given algorithm work on the same
+     * file
+     */
+    public boolean worksOnSameFile;
+
+    /**
+     * Get the recommended space to reserve for the given algorithm. The amount
+     * is in bytes
+     */
+    public int recommendedReserve;
+
+    /**
+     * the download to post-process
+     */
+    protected DownloadMission mission;
+
+    Postprocessing(DownloadMission mission, int recommendedReserve, boolean worksOnSameFile) {
+        this.mission = mission;
+        this.recommendedReserve = recommendedReserve;
+        this.worksOnSameFile = worksOnSameFile;
+    }
+
+    public void run() throws IOException {
+        File file = mission.getDownloadedFile();
+        CircularFile out = null;
+        int result;
+        long finalLength = -1;
+
+        mission.done = 0;
+        mission.length = file.length();
+
+        if (worksOnSameFile) {
+            ChunkFileInputStream[] sources = new ChunkFileInputStream[mission.urls.length];
+            try {
+                int i = 0;
+                for (; i < sources.length - 1; i++) {
+                    sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.offsets[i + 1], "rw");
+                }
+                sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.getDownloadedFile().length(), "rw");
+
+                int[] idx = {0};
+                CircularFile.OffsetChecker checker = () -> {
+                    while (idx[0] < sources.length) {
+                        /*
+                         * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
+                         *          or the CircularFile can lead to unexpected results
+                         */
+                        if (sources[idx[0]].isDisposed() || sources[idx[0]].available() < 1) {
+                            idx[0]++;
+                            continue;// the selected source is not used anymore
+                        }
+
+                        return sources[idx[0]].getFilePointer() - 1;
+                    }
+
+                    return -1;
+                };
+                out = new CircularFile(file, 0, this::progressReport, checker);
+
+                result = process(out, sources);
+
+                if (result == OK_RESULT)
+                    finalLength = out.finalizeFile();
+            } finally {
+                for (SharpStream source : sources) {
+                    if (source != null && !source.isDisposed()) {
+                        source.dispose();
+                    }
+                }
+                if (out != null) {
+                    out.dispose();
+                }
+            }
+        } else {
+            result = process(null);
+        }
+
+        if (result == OK_RESULT) {
+            if (finalLength < 0) finalLength = file.length();
+            mission.done = finalLength;
+            mission.length = finalLength;
+        } else {
+            mission.errCode = DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+            mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
+        }
+
+        if (result != OK_RESULT && worksOnSameFile) {
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+        }
+    }
+
+    /**
+     * Abstract method to execute the pos-processing algorithm
+     *
+     * @param out     output stream
+     * @param sources files to be processed
+     * @return a error code, 0 means the operation was successful
+     * @throws IOException if an I/O error occurs.
+     */
+    abstract int process(SharpStream out, SharpStream... sources) throws IOException;
+
+    String getArgumentAt(int index, String defaultValue) {
+        if (mission.postprocessingArgs == null || index >= mission.postprocessingArgs.length) {
+            return defaultValue;
+        }
+
+        return mission.postprocessingArgs[index];
+    }
+
+    void progressReport(long done) {
+        mission.done = done;
+        if (mission.length < mission.done) mission.length = mission.done;
+
+        Message m = new Message();
+        m.what = DownloadManagerService.MESSAGE_PROGRESS;
+        m.obj = mission;
+
+        mission.mHandler.sendMessage(m);
+    }
+}

app/src/main/java/us/shandian/giga/postprocessing/TtmlConverter.java

@@ -0,0 +1,75 @@
+package us.shandian.giga.postprocessing;
+
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+import org.schabi.newpipe.streams.SubtitleConverter;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.postprocessing.io.SharpInputStream;
+
+/**
+ * @author kapodamy
+ */
+class TtmlConverter extends Postprocessing {
+    private static final String TAG = "TtmlConverter";
+
+    TtmlConverter(DownloadMission mission) {
+        // due how XmlPullParser works, the xml is fully loaded on the ram
+        super(mission, 0, true);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        // check if the subtitle is already in srt and copy, this should never happen
+        String format = getArgumentAt(0, null);
+
+        if (format == null || format.equals("ttml")) {
+            SubtitleConverter ttmlDumper = new SubtitleConverter();
+
+            try {
+                ttmlDumper.dumpTTML(
+                        sources[0],
+                        out,
+                        getArgumentAt(1, "true").equals("true"),
+                        getArgumentAt(2, "true").equals("true")
+                );
+            } catch (Exception err) {
+                Log.e(TAG, "subtitle parse failed", err);
+
+                if (err instanceof IOException) {
+                    return 1;
+                } else if (err instanceof ParseException) {
+                    return 2;
+                } else if (err instanceof SAXException) {
+                    return 3;
+                } else if (err instanceof ParserConfigurationException) {
+                    return 4;
+                } else if (err instanceof XPathExpressionException) {
+                    return 7;
+                }
+
+                return 8;
+            }
+
+            return OK_RESULT;
+        } else if (format.equals("srt")) {
+            byte[] buffer = new byte[8 * 1024];
+            int read;
+            while ((read = sources[0].read(buffer)) > 0) {
+                out.write(buffer, 0, read);
+            }
+            return OK_RESULT;
+        }
+
+        throw new UnsupportedOperationException("Can't convert this subtitle, unimplemented format: " + format);
+    }
+
+}

app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java

@@ -0,0 +1,42 @@
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.WebMReader.TrackKind;
+import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+import org.schabi.newpipe.streams.WebMWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * @author kapodamy
+ */
+class WebMMuxer extends Postprocessing {
+
+    WebMMuxer(DownloadMission mission) {
+        super(mission, 2048 * 1024/* 2 MiB */, true);
+    }
+
+    @Override
+    int process(SharpStream out, SharpStream... sources) throws IOException {
+        WebMWriter muxer = new WebMWriter(sources);
+        muxer.parseSources();
+
+        // youtube uses a webm with a fake video track that acts as a "cover image"
+        WebMTrack[] tracks = muxer.getTracksFromSource(1);
+        int audioTrackIndex = 0;
+        for (int i = 0; i < tracks.length; i++) {
+            if (tracks[i].kind == TrackKind.Audio) {
+                audioTrackIndex = i;
+                break;
+            }
+        }
+
+        muxer.selectTracks(0, audioTrackIndex);
+        muxer.build(out);
+
+        return OK_RESULT;
+    }
+
+}

app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java

@@ -0,0 +1,153 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class ChunkFileInputStream extends SharpStream {
+
+    private RandomAccessFile source;
+    private final long offset;
+    private final long length;
+    private long position;
+
+    public ChunkFileInputStream(File file, long start, long end, String mode) throws IOException {
+        source = new RandomAccessFile(file, mode);
+        offset = start;
+        length = end - start;
+        position = 0;
+
+        if (length < 1) {
+            source.close();
+            throw new IOException("The chunk is empty or invalid");
+        }
+        if (source.length() < end) {
+            try {
+                throw new IOException(String.format("invalid file length. expected = %s  found = %s", end, source.length()));
+            } finally {
+                source.close();
+            }
+        }
+
+        source.seek(offset);
+    }
+
+    /**
+     * Get absolute position on file
+     *
+     * @return the position
+     */
+    public long getFilePointer() {
+        return offset + position;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if ((position + 1) > length) {
+            return 0;
+        }
+
+        int res = source.read();
+        if (res >= 0) {
+            position++;
+        }
+
+        return res;
+    }
+
+    @Override
+    public int read(byte b[]) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public int read(byte b[], int off, int len) throws IOException {
+        if ((position + len) > length) {
+            len = (int) (length - position);
+        }
+        if (len == 0) {
+            return 0;
+        }
+
+        int res = source.read(b, off, len);
+        position += res;
+
+        return res;
+    }
+
+    @Override
+    public long skip(long pos) throws IOException {
+        pos = Math.min(pos + position, length);
+
+        if (pos == 0) {
+            return 0;
+        }
+
+        source.seek(offset + pos);
+
+        long oldPos = position;
+        position = pos;
+
+        return pos - oldPos;
+    }
+
+    @Override
+    public int available() {
+        return (int) (length - position);
+    }
+
+    @SuppressWarnings("EmptyCatchBlock")
+    @Override
+    public void dispose() {
+        try {
+            source.close();
+        } catch (IOException err) {
+        } finally {
+            source = null;
+        }
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return source == null;
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        position = 0;
+        source.seek(offset);
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canRead() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return false;
+    }
+
+    @Override
+    public void write(byte value) {
+    }
+
+    @Override
+    public void write(byte[] buffer) {
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) {
+    }
+
+    @Override
+    public void flush() {
+    }
+}

app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java

@@ -0,0 +1,375 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+
+public class CircularFile extends SharpStream {
+
+    private final static int AUX_BUFFER_SIZE = 1024 * 1024;// 1 MiB
+    private final static int AUX_BUFFER_SIZE2 = 512 * 1024;// 512 KiB
+    private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
+    private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
+    private final static boolean IMMEDIATE_AUX_BUFFER_FLUSH = false;
+
+    private RandomAccessFile out;
+    private long position;
+    private long maxLengthKnown = -1;
+
+    private ArrayList<ManagedBuffer> auxiliaryBuffers;
+    private OffsetChecker callback;
+    private ManagedBuffer queue;
+    private long startOffset;
+    private ProgressReport onProgress;
+    private long reportPosition;
+
+    public CircularFile(File file, long offset, ProgressReport progressReport, OffsetChecker checker) throws IOException {
+        if (checker == null) {
+            throw new NullPointerException("checker is null");
+        }
+
+        try {
+            queue = new ManagedBuffer(QUEUE_BUFFER_SIZE);
+            out = new RandomAccessFile(file, "rw");
+            out.seek(offset);
+            position = offset;
+        } catch (IOException err) {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                // nothing to do
+            }
+            throw err;
+        }
+
+        auxiliaryBuffers = new ArrayList<>(15);
+        callback = checker;
+        startOffset = offset;
+        reportPosition = offset;
+        onProgress = progressReport;
+
+    }
+
+    /**
+     * Close the file without flushing any buffer
+     */
+    @Override
+    public void dispose() {
+        try {
+            auxiliaryBuffers = null;
+            if (out != null) {
+                out.close();
+                out = null;
+            }
+        } catch (IOException err) {
+            // nothing to do
+        }
+    }
+
+    /**
+     * Flush any buffer and close the output file. Use this method if the
+     * operation is successful
+     *
+     * @return the final length of the file
+     * @throws IOException if an I/O error occurs
+     */
+    public long finalizeFile() throws IOException {
+        flushEverything();
+
+        if (maxLengthKnown > -1) {
+            position = maxLengthKnown;
+        }
+        if (position < out.length()) {
+            out.setLength(position);
+        }
+
+        dispose();
+
+        return position;
+    }
+
+    @Override
+    public void write(byte b) throws IOException {
+        write(new byte[]{b}, 0, 1);
+    }
+
+    @Override
+    public void write(byte b[]) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    @Override
+    public void write(byte b[], int off, int len) throws IOException {
+        if (len == 0) {
+            return;
+        }
+
+        long end = callback.check();
+        long available;
+
+        if (end == -1) {
+            available = Long.MAX_VALUE;
+        } else {
+            if (end < startOffset) {
+                throw new IOException("The reported offset is invalid. reported offset is " + String.valueOf(end));
+            }
+            available = end - position;
+        }
+
+        // Check if possible flush one or more auxiliary buffer
+        if (auxiliaryBuffers.size() > 0) {
+            ManagedBuffer aux = auxiliaryBuffers.get(0);
+
+            // check if there is enough space to flush it completely
+            while (available >= (aux.size + queue.size)) {
+                available -= aux.size;
+                writeQueue(aux.buffer, 0, aux.size);
+                aux.dereference();
+                auxiliaryBuffers.remove(0);
+
+                if (auxiliaryBuffers.size() < 1) {
+                    aux = null;
+                    break;
+                }
+                aux = auxiliaryBuffers.get(0);
+            }
+
+            if (IMMEDIATE_AUX_BUFFER_FLUSH) {
+                // try partial flush to avoid allocate another auxiliary buffer
+                if (aux != null && aux.available() < len && available > queue.size) {
+                    int size = Math.min(aux.size, (int) available - queue.size);
+
+                    writeQueue(aux.buffer, 0, size);
+                    aux.dereference(size);
+
+                    available -= size;
+                }
+            }
+        }
+
+        if (auxiliaryBuffers.size() < 1 && available > (len + queue.size)) {
+            writeQueue(b, off, len);
+        } else {
+            int i = auxiliaryBuffers.size() - 1;
+            while (len > 0) {
+                if (i < 0) {
+                    // allocate a new auxiliary buffer
+                    auxiliaryBuffers.add(new ManagedBuffer(AUX_BUFFER_SIZE));
+                    i++;
+                }
+
+                ManagedBuffer aux = auxiliaryBuffers.get(i);
+                available = aux.available();
+
+                if (available < 1) {
+                    // secondary auxiliary buffer
+                    available = len;
+                    aux = new ManagedBuffer(Math.max(len, AUX_BUFFER_SIZE2));
+                    auxiliaryBuffers.add(aux);
+                    i++;
+                } else {
+                    available = Math.min(len, available);
+                }
+
+                aux.write(b, off, (int) available);
+
+                len -= available;
+                if (len > 0) off += available;
+            }
+        }
+    }
+
+    private void writeOutside(byte buffer[], int offset, int length) throws IOException {
+        out.write(buffer, offset, length);
+        position += length;
+
+        if (onProgress != null && position > reportPosition) {
+            reportPosition = position + NOTIFY_BYTES_INTERVAL;
+            onProgress.report(position);
+        }
+    }
+
+    private void writeQueue(byte[] buffer, int offset, int length) throws IOException {
+        while (length > 0) {
+            if (queue.available() < length) {
+                flushQueue();
+
+                if (length >= queue.buffer.length) {
+                    writeOutside(buffer, offset, length);
+                    return;
+                }
+            }
+
+            int size = Math.min(queue.available(), length);
+            queue.write(buffer, offset, size);
+
+            offset += size;
+            length -= size;
+        }
+
+        if (queue.size >= queue.buffer.length) {
+            flushQueue();
+        }
+    }
+
+    private void flushQueue() throws IOException {
+        writeOutside(queue.buffer, 0, queue.size);
+        queue.size = 0;
+    }
+
+    private void flushEverything() throws IOException {
+        flushQueue();
+
+        if (auxiliaryBuffers.size() > 0) {
+            for (ManagedBuffer aux : auxiliaryBuffers) {
+                writeOutside(aux.buffer, 0, aux.size);
+                aux.dereference();
+            }
+            auxiliaryBuffers.clear();
+        }
+    }
+
+    /**
+     * Flush any buffer directly to the file. Warning: use this method ONLY if
+     * all read dependencies are disposed
+     *
+     * @throws IOException if the dependencies are not disposed
+     */
+    @Override
+    public void flush() throws IOException {
+        if (callback.check() != -1) {
+            throw new IOException("All read dependencies of this file must be disposed first");
+        }
+        flushEverything();
+
+        // Save the current file length in case the method {@code rewind()} is called
+        if (position > maxLengthKnown) {
+            maxLengthKnown = position;
+        }
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        flush();
+        out.seek(startOffset);
+
+        if (onProgress != null) {
+            onProgress.report(-position);
+        }
+
+        position = startOffset;
+        reportPosition = startOffset;
+
+    }
+
+    @Override
+    public long skip(long amount) throws IOException {
+        flush();
+        position += amount;
+
+        out.seek(position);
+
+        return amount;
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return out == null;
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return true;
+    }
+
+    //<editor-fold defaultState="collapsed" desc="stub read methods">
+    @Override
+    public boolean canRead() {
+        return false;
+    }
+
+    @Override
+    public int read() {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public int read(byte[] buffer) {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public int read(byte[] buffer, int offset, int count) {
+        throw new UnsupportedOperationException("write-only");
+    }
+
+    @Override
+    public int available() {
+        throw new UnsupportedOperationException("write-only");
+    }
+//</editor-fold>
+
+    public interface OffsetChecker {
+
+        /**
+         * Checks the amount of available space ahead
+         *
+         * @return absolute offset in the file where no more data SHOULD NOT be
+         * written. If the value is -1 the whole file will be used
+         */
+        long check();
+    }
+
+    public interface ProgressReport {
+
+        void report(long progress);
+    }
+
+    class ManagedBuffer {
+
+        byte[] buffer;
+        int size;
+
+        ManagedBuffer(int length) {
+            buffer = new byte[length];
+        }
+
+        void dereference() {
+            buffer = null;
+            size = 0;
+        }
+
+        void dereference(int amount) {
+            if (amount > size) {
+                throw new IndexOutOfBoundsException("Invalid dereference amount (" + amount + ">=" + size + ")");
+            }
+            size -= amount;
+            System.arraycopy(buffer, amount, buffer, 0, size);
+        }
+
+        protected int available() {
+            return buffer.length - size;
+        }
+
+        private void write(byte[] b, int off, int len) {
+            System.arraycopy(b, off, buffer, size, len);
+            size += len;
+        }
+
+        @Override
+        public String toString() {
+            return "holding: " + String.valueOf(size) + " length: " + String.valueOf(buffer.length) + " available: " + String.valueOf(available());
+        }
+
+    }
+}

app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java

@@ -0,0 +1,126 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+
+/**
+ * @author kapodamy
+ */
+public class FileStream extends SharpStream {
+
+    public enum Mode {
+        Read,
+        ReadWrite
+    }
+
+    public RandomAccessFile source;
+    private final Mode mode;
+
+    public FileStream(String path, Mode mode) throws IOException {
+        String flags;
+
+        if (mode == Mode.Read) {
+            flags = "r";
+        } else {
+            flags = "rw";
+        }
+
+        this.mode = mode;
+        source = new RandomAccessFile(path, flags);
+    }
+
+    @Override
+    public int read() throws IOException {
+        return source.read();
+    }
+
+    @Override
+    public int read(byte b[]) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public int read(byte b[], int off, int len) throws IOException {
+        return source.read(b, off, len);
+    }
+
+    @Override
+    public long skip(long pos) throws IOException {
+        FileChannel fc = source.getChannel();
+        fc.position(fc.position() + pos);
+        return pos;
+    }
+
+    @Override
+    public int available() {
+        try {
+            return (int) (source.length() - source.getFilePointer());
+        } catch (IOException ex) {
+            return 0;
+        }
+    }
+
+    @SuppressWarnings("EmptyCatchBlock")
+    @Override
+    public void dispose() {
+        try {
+            source.close();
+        } catch (IOException err) {
+
+        } finally {
+            source = null;
+        }
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return source == null;
+    }
+
+    @Override
+    public void rewind() throws IOException {
+        source.getChannel().position(0);
+    }
+
+    @Override
+    public boolean canRewind() {
+        return true;
+    }
+
+    @Override
+    public boolean canRead() {
+        return mode == Mode.Read || mode == Mode.ReadWrite;
+    }
+
+    @Override
+    public boolean canWrite() {
+        return mode == Mode.ReadWrite;
+    }
+
+    @Override
+    public void write(byte value) throws IOException {
+        source.write(value);
+    }
+
+    @Override
+    public void write(byte[] buffer) throws IOException {
+        source.write(buffer);
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) throws IOException {
+        source.write(buffer, offset, count);
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void setLength(long length) throws IOException {
+        source.setLength(length);
+    }
+}

app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java

@@ -0,0 +1,59 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package us.shandian.giga.postprocessing.io;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Wrapper for the classic {@link java.io.InputStream}
+ * @author kapodamy
+ */
+public class SharpInputStream extends InputStream {
+
+    private final SharpStream base;
+
+    public SharpInputStream(SharpStream base) throws IOException {
+        if (!base.canRead()) {
+            throw new IOException("The provided stream is not readable");
+        }
+        this.base = base;
+    }
+
+    @Override
+    public int read() throws IOException {
+        return base.read();
+    }
+
+    @Override
+    public int read(@NonNull byte[] bytes) throws IOException {
+        return base.read(bytes);
+    }
+
+    @Override
+    public int read(@NonNull byte[] bytes, int i, int i1) throws IOException {
+        return base.read(bytes, i, i1);
+    }
+
+    @Override
+    public long skip(long l) throws IOException {
+        return base.skip(l);
+    }
+
+    @Override
+    public int available() {
+        return base.available();
+    }
+
+    @Override
+    public void close() {
+        base.dispose();
+    }
+}

app/src/main/java/us/shandian/giga/service/DownloadManager.java

@@ -0,0 +1,686 @@
+package us.shandian.giga.service;
+
+import android.content.Context;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.util.DiffUtil;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+import us.shandian.giga.get.sqlite.DownloadDataSource;
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadManager {
+    private static final String TAG = DownloadManager.class.getSimpleName();
+
+    enum NetworkState {Unavailable, WifiOperating, MobileOperating, OtherOperating}
+
+    public final static int SPECIAL_NOTHING = 0;
+    public final static int SPECIAL_PENDING = 1;
+    public final static int SPECIAL_FINISHED = 2;
+
+    private final DownloadDataSource mDownloadDataSource;
+
+    private final ArrayList<DownloadMission> mMissionsPending = new ArrayList<>();
+    private final ArrayList<FinishedMission> mMissionsFinished;
+
+    private final Handler mHandler;
+    private final File mPendingMissionsDir;
+
+    private NetworkState mLastNetworkStatus = NetworkState.Unavailable;
+
+    int mPrefMaxRetry;
+    boolean mPrefCrossNetwork;
+
+    /**
+     * Create a new instance
+     *
+     * @param context Context for the data source for finished downloads
+     * @param handler Thread required for Messaging
+     */
+    DownloadManager(@NonNull Context context, Handler handler) {
+        if (DEBUG) {
+            Log.d(TAG, "new DownloadManager instance. 0x" + Integer.toHexString(this.hashCode()));
+        }
+
+        mDownloadDataSource = new DownloadDataSource(context);
+        mHandler = handler;
+        mMissionsFinished = loadFinishedMissions();
+        mPendingMissionsDir = getPendingDir(context);
+
+        if (!Utility.mkdir(mPendingMissionsDir, false)) {
+            throw new RuntimeException("failed to create pending_downloads in data directory");
+        }
+
+        loadPendingMissions();
+    }
+
+    private static File getPendingDir(@NonNull Context context) {
+        //File dir = new File(ContextCompat.getDataDir(context), "pending_downloads");
+        File dir = context.getExternalFilesDir("pending_downloads");
+
+        if (dir == null) {
+            // One of the following paths are not accessible ¿unmounted internal memory?
+            //        /storage/emulated/0/Android/data/org.schabi.newpipe[.debug]/pending_downloads
+            //        /sdcard/Android/data/org.schabi.newpipe[.debug]/pending_downloads
+            Log.w(TAG, "path to pending downloads are not accessible");
+        }
+
+        return dir;
+    }
+
+    /**
+     * Loads finished missions from the data source
+     */
+    private ArrayList<FinishedMission> loadFinishedMissions() {
+        ArrayList<FinishedMission> finishedMissions = mDownloadDataSource.loadFinishedMissions();
+
+        // missions always is stored by creation order, simply reverse the list
+        ArrayList<FinishedMission> result = new ArrayList<>(finishedMissions.size());
+        for (int i = finishedMissions.size() - 1; i >= 0; i--) {
+            FinishedMission mission = finishedMissions.get(i);
+            File file = mission.getDownloadedFile();
+
+            if (!file.isFile()) {
+                if (DEBUG) {
+                    Log.d(TAG, "downloaded file removed: " + file.getAbsolutePath());
+                }
+                mDownloadDataSource.deleteMission(mission);
+                continue;
+            }
+
+            result.add(mission);
+        }
+
+        return result;
+    }
+
+    private void loadPendingMissions() {
+        File[] subs = mPendingMissionsDir.listFiles();
+
+        if (subs == null) {
+            Log.e(TAG, "listFiles() returned null");
+            return;
+        }
+        if (subs.length < 1) {
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "Loading pending downloads from directory: " + mPendingMissionsDir.getAbsolutePath());
+        }
+
+        for (File sub : subs) {
+            if (sub.isFile()) {
+                DownloadMission mis = Utility.readFromFile(sub);
+
+                if (mis == null) {
+                    //noinspection ResultOfMethodCallIgnored
+                    sub.delete();
+                } else {
+                    if (mis.isFinished()) {
+                        //noinspection ResultOfMethodCallIgnored
+                        sub.delete();
+                        continue;
+                    }
+
+                    File dl = mis.getDownloadedFile();
+                    boolean exists = dl.exists();
+
+                    if (mis.isPsRunning()) {
+                        if (mis.postprocessingThis) {
+                            // Incomplete post-processing results in a corrupted download file
+                            // because the selected algorithm works on the same file to save space.
+                            if (exists && dl.isFile() && !dl.delete())
+                                Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
+
+                            exists = true;
+                        }
+
+                        mis.postprocessingState = 0;
+                        mis.errCode = DownloadMission.ERROR_POSTPROCESSING;
+                        mis.errObject = new RuntimeException("stopped unexpectedly");
+                    } else if (exists && !dl.isFile()) {
+                        // probably a folder, this should never happens
+                        if (!sub.delete()) {
+                            Log.w(TAG, "Unable to delete serialized file: " + sub.getPath());
+                        }
+                        continue;
+                    }
+
+                    if (!exists) {
+                        // downloaded file deleted, reset mission state
+                        DownloadMission m = new DownloadMission(mis.urls, mis.name, mis.location, mis.kind, mis.postprocessingName, mis.postprocessingArgs);
+                        m.timestamp = mis.timestamp;
+                        m.threadCount = mis.threadCount;
+                        m.source = mis.source;
+                        m.maxRetry = mis.maxRetry;
+                        m.nearLength = mis.nearLength;
+                        mis = m;
+                    }
+
+                    mis.running = false;
+                    mis.recovered = exists;
+                    mis.metadata = sub;
+                    mis.mHandler = mHandler;
+
+                    mMissionsPending.add(mis);
+                }
+            }
+        }
+
+        if (mMissionsPending.size() > 1) {
+            Collections.sort(mMissionsPending, (mission1, mission2) -> Long.compare(mission1.timestamp, mission2.timestamp));
+        }
+    }
+
+    /**
+     * Start a new download mission
+     *
+     * @param urls     the list of urls to download
+     * @param location the location
+     * @param name     the name of the file to create
+     * @param kind     type of file (a: audio  v: video  s: subtitle ?: file-extension defined)
+     * @param threads  the number of threads maximal used to download chunks of the file.
+     * @param psName   the name of the required post-processing algorithm, or {@code null} to ignore.
+     * @param source   source url of the resource
+     * @param psArgs   the arguments for the post-processing algorithm.
+     */
+    void startMission(String[] urls, String location, String name, char kind, int threads,
+                      String source, String psName, String[] psArgs, long nearLength) {
+        synchronized (this) {
+            // check for existing pending download
+            DownloadMission pendingMission = getPendingMission(location, name);
+            if (pendingMission != null) {
+                // generate unique filename (?)
+                try {
+                    name = generateUniqueName(location, name);
+                } catch (Exception e) {
+                    Log.e(TAG, "Unable to generate unique name", e);
+                    name = System.currentTimeMillis() + name;
+                    Log.i(TAG, "Using " + name);
+                }
+            } else {
+                // check for existing finished download
+                int index = getFinishedMissionIndex(location, name);
+                if (index >= 0) mDownloadDataSource.deleteMission(mMissionsFinished.remove(index));
+            }
+
+            DownloadMission mission = new DownloadMission(urls, name, location, kind, psName, psArgs);
+            mission.timestamp = System.currentTimeMillis();
+            mission.threadCount = threads;
+            mission.source = source;
+            mission.mHandler = mHandler;
+            mission.maxRetry = mPrefMaxRetry;
+            mission.nearLength = nearLength;
+
+            while (true) {
+                mission.metadata = new File(mPendingMissionsDir, String.valueOf(mission.timestamp));
+                if (!mission.metadata.isFile() && !mission.metadata.exists()) {
+                    try {
+                        if (!mission.metadata.createNewFile())
+                            throw new RuntimeException("Cant create download metadata file");
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                    break;
+                }
+                mission.timestamp = System.currentTimeMillis();
+            }
+
+            mMissionsPending.add(mission);
+
+            // Before starting, save the state in case the internet connection is not available
+            Utility.writeToFile(mission.metadata, mission);
+
+            if (canDownloadInCurrentNetwork() && (getRunningMissionsCount() < 1)) {
+                mission.start();
+                mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
+            }
+        }
+    }
+
+
+    public void resumeMission(DownloadMission mission) {
+        if (!mission.running) {
+            mission.start();
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
+        }
+    }
+
+    public void pauseMission(DownloadMission mission) {
+        if (mission.running) {
+            mission.pause();
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+        }
+    }
+
+    public void deleteMission(Mission mission) {
+        synchronized (this) {
+            if (mission instanceof DownloadMission) {
+                mMissionsPending.remove(mission);
+            } else if (mission instanceof FinishedMission) {
+                mMissionsFinished.remove(mission);
+                mDownloadDataSource.deleteMission(mission);
+            }
+
+            mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
+            mission.delete();
+        }
+    }
+
+
+    /**
+     * Get a pending mission by its location and name
+     *
+     * @param location the location
+     * @param name     the name
+     * @return the mission or null if no such mission exists
+     */
+    @Nullable
+    private DownloadMission getPendingMission(String location, String name) {
+        for (DownloadMission mission : mMissionsPending) {
+            if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+                return mission;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get a finished mission by its location and name
+     *
+     * @param location the location
+     * @param name     the name
+     * @return the mission index or -1 if no such mission exists
+     */
+    private int getFinishedMissionIndex(String location, String name) {
+        for (int i = 0; i < mMissionsFinished.size(); i++) {
+            FinishedMission mission = mMissionsFinished.get(i);
+            if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    public Mission getAnyMission(String location, String name) {
+        synchronized (this) {
+            Mission mission = getPendingMission(location, name);
+            if (mission != null) return mission;
+
+            int idx = getFinishedMissionIndex(location, name);
+            if (idx >= 0) return mMissionsFinished.get(idx);
+        }
+
+        return null;
+    }
+
+    int getRunningMissionsCount() {
+        int count = 0;
+        synchronized (this) {
+            for (DownloadMission mission : mMissionsPending) {
+                if (mission.running && !mission.isFinished() && !mission.isPsFailed())
+                    count++;
+            }
+        }
+
+        return count;
+    }
+
+    void pauseAllMissions() {
+        synchronized (this) {
+            for (DownloadMission mission : mMissionsPending) mission.pause();
+        }
+    }
+
+
+    /**
+     * Splits the filename into name and extension
+     * <p>
+     * Dots are ignored if they appear: not at all, at the beginning of the file,
+     * at the end of the file
+     *
+     * @param name the name to split
+     * @return a string array with a length of 2 containing the name and the extension
+     */
+    private static String[] splitName(String name) {
+        int dotIndex = name.lastIndexOf('.');
+        if (dotIndex <= 0 || (dotIndex == name.length() - 1)) {
+            return new String[]{name, ""};
+        } else {
+            return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
+        }
+    }
+
+    /**
+     * Generates a unique file name.
+     * <p>
+     * e.g. "myName (1).txt" if the name "myName.txt" exists.
+     *
+     * @param location the location (to check for existing files)
+     * @param name     the name of the file
+     * @return the unique file name
+     * @throws IllegalArgumentException if the location is not a directory
+     * @throws SecurityException        if the location is not readable
+     */
+    private static String generateUniqueName(String location, String name) {
+        if (location == null) throw new NullPointerException("location is null");
+        if (name == null) throw new NullPointerException("name is null");
+        File destination = new File(location);
+        if (!destination.isDirectory()) {
+            throw new IllegalArgumentException("location is not a directory: " + location);
+        }
+        final String[] nameParts = splitName(name);
+        String[] existingName = destination.list((dir, name1) -> name1.startsWith(nameParts[0]));
+        Arrays.sort(existingName);
+        String newName;
+        int downloadIndex = 0;
+        do {
+            newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
+            ++downloadIndex;
+            if (downloadIndex == 1000) {  // Probably an error on our side
+                throw new RuntimeException("Too many existing files");
+            }
+        } while (Arrays.binarySearch(existingName, newName) >= 0);
+        return newName;
+    }
+
+    /**
+     * Set a pending download as finished
+     *
+     * @param mission the desired mission
+     */
+    void setFinished(DownloadMission mission) {
+        synchronized (this) {
+            mMissionsPending.remove(mission);
+            mMissionsFinished.add(0, new FinishedMission(mission));
+            mDownloadDataSource.addMission(mission);
+        }
+    }
+
+    /**
+     * runs another mission in queue if possible
+     *
+     * @return true if exits pending missions running or a mission was started, otherwise, false
+     */
+    boolean runAnotherMission() {
+        synchronized (this) {
+            if (mMissionsPending.size() < 1) return false;
+
+            int i = getRunningMissionsCount();
+            if (i > 0) return true;
+
+            if (!canDownloadInCurrentNetwork()) return false;
+
+            for (DownloadMission mission : mMissionsPending) {
+                if (!mission.running && mission.errCode == DownloadMission.ERROR_NOTHING && mission.enqueued) {
+                    resumeMission(mission);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    public MissionIterator getIterator() {
+        return new MissionIterator();
+    }
+
+    /**
+     * Forget all finished downloads, but, doesn't delete any file
+     */
+    public void forgetFinishedDownloads() {
+        synchronized (this) {
+            for (FinishedMission mission : mMissionsFinished) {
+                mDownloadDataSource.deleteMission(mission);
+            }
+            mMissionsFinished.clear();
+        }
+    }
+
+    private boolean canDownloadInCurrentNetwork() {
+        if (mLastNetworkStatus == NetworkState.Unavailable) return false;
+        return !(mPrefCrossNetwork && mLastNetworkStatus == NetworkState.MobileOperating);
+    }
+
+    void handleConnectivityChange(NetworkState currentStatus) {
+        if (currentStatus == mLastNetworkStatus) return;
+
+        mLastNetworkStatus = currentStatus;
+
+        if (currentStatus == NetworkState.Unavailable) {
+            return;
+        } else if (currentStatus != NetworkState.MobileOperating || !mPrefCrossNetwork) {
+            return;
+        }
+
+        boolean flag = false;
+        synchronized (this) {
+            for (DownloadMission mission : mMissionsPending) {
+                if (mission.running && !mission.isFinished() && !mission.isPsRunning()) {
+                    flag = true;
+                    mission.pause();
+                }
+            }
+        }
+
+        if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+    }
+
+    void updateMaximumAttempts() {
+        synchronized (this) {
+            for (DownloadMission mission : mMissionsPending) mission.maxRetry = mPrefMaxRetry;
+        }
+    }
+
+    /**
+     * Fast check for pending downloads. If exists, the user will be notified
+     * TODO: call this method in somewhere
+     *
+     * @param context the application context
+     */
+    public static void notifyUserPendingDownloads(Context context) {
+        int pending = getPendingDir(context).list().length;
+        if (pending < 1) return;
+
+        Toast.makeText(context, context.getString(
+                R.string.msg_pending_downloads,
+                String.valueOf(pending)
+        ), Toast.LENGTH_LONG).show();
+    }
+
+    void checkForRunningMission(String location, String name, DownloadManagerService.DMChecker check) {
+        boolean listed;
+        boolean finished = false;
+
+        synchronized (this) {
+            DownloadMission mission = getPendingMission(location, name);
+            if (mission != null) {
+                listed = true;
+            } else {
+                listed = getFinishedMissionIndex(location, name) >= 0;
+                finished = listed;
+            }
+        }
+
+        check.callback(listed, finished);
+    }
+
+    public class MissionIterator extends DiffUtil.Callback {
+        final Object FINISHED = new Object();
+        final Object PENDING = new Object();
+
+        ArrayList<Object> snapshot;
+        ArrayList<Object> current;
+        ArrayList<Mission> hidden;
+
+        boolean hasFinished = false;
+
+        private MissionIterator() {
+            hidden = new ArrayList<>(2);
+            current = null;
+            snapshot = getSpecialItems();
+        }
+
+        private ArrayList<Object> getSpecialItems() {
+            synchronized (DownloadManager.this) {
+                ArrayList<Mission> pending = new ArrayList<>(mMissionsPending);
+                ArrayList<Mission> finished = new ArrayList<>(mMissionsFinished);
+                ArrayList<Mission> remove = new ArrayList<>(hidden);
+
+                // hide missions (if required)
+                Iterator<Mission> iterator = remove.iterator();
+                while (iterator.hasNext()) {
+                    Mission mission = iterator.next();
+                    if (pending.remove(mission) || finished.remove(mission)) iterator.remove();
+                }
+
+                int fakeTotal = pending.size();
+                if (fakeTotal > 0) fakeTotal++;
+
+                fakeTotal += finished.size();
+                if (finished.size() > 0) fakeTotal++;
+
+                ArrayList<Object> list = new ArrayList<>(fakeTotal);
+                if (pending.size() > 0) {
+                    list.add(PENDING);
+                    list.addAll(pending);
+                }
+                if (finished.size() > 0) {
+                    list.add(FINISHED);
+                    list.addAll(finished);
+                }
+
+                hasFinished = finished.size() > 0;
+
+                return list;
+            }
+        }
+
+        public MissionItem getItem(int position) {
+            Object object = snapshot.get(position);
+
+            if (object == PENDING) return new MissionItem(SPECIAL_PENDING);
+            if (object == FINISHED) return new MissionItem(SPECIAL_FINISHED);
+
+            return new MissionItem(SPECIAL_NOTHING, (Mission) object);
+        }
+
+        public int getSpecialAtItem(int position) {
+            Object object = snapshot.get(position);
+
+            if (object == PENDING) return SPECIAL_PENDING;
+            if (object == FINISHED) return SPECIAL_FINISHED;
+
+            return SPECIAL_NOTHING;
+        }
+
+        public MissionItem getItemUnsafe(int position) {
+            synchronized (DownloadManager.this) {
+                int count = mMissionsPending.size();
+                int count2 = mMissionsFinished.size();
+
+                if (count > 0) {
+                    position--;
+                    if (position == -1)
+                        return new MissionItem(SPECIAL_PENDING);
+                    else if (position < count)
+                        return new MissionItem(SPECIAL_NOTHING, mMissionsPending.get(position));
+                    else if (position == count && count2 > 0)
+                        return new MissionItem(SPECIAL_FINISHED);
+                    else
+                        position -= count;
+                } else {
+                    if (count2 > 0 && position == 0) {
+                        return new MissionItem(SPECIAL_FINISHED);
+                    }
+                }
+
+                position--;
+
+                if (count2 < 1) {
+                    throw new RuntimeException(
+                            String.format("Out of range. pending_count=%s  finished_count=%s  position=%s", count, count2, position)
+                    );
+                }
+
+                return new MissionItem(SPECIAL_NOTHING, mMissionsFinished.get(position));
+            }
+        }
+
+
+        public void start() {
+            current = getSpecialItems();
+        }
+
+        public void end() {
+            snapshot = current;
+            current = null;
+        }
+
+        public void hide(Mission mission) {
+            hidden.add(mission);
+        }
+
+        public void unHide(Mission mission) {
+            hidden.remove(mission);
+        }
+
+        public boolean hasFinishedMissions() {
+            return hasFinished;
+        }
+
+
+        @Override
+        public int getOldListSize() {
+            return snapshot.size();
+        }
+
+        @Override
+        public int getNewListSize() {
+            return current.size();
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return snapshot.get(oldItemPosition) == current.get(newItemPosition);
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return areItemsTheSame(oldItemPosition, newItemPosition);
+        }
+    }
+
+    public class MissionItem {
+        public int special;
+        public Mission mission;
+
+        MissionItem(int s, Mission m) {
+            special = s;
+            mission = m;
+        }
+
+        MissionItem(int s) {
+            this(s, null);
+        }
+    }
+
+}

app/src/main/java/us/shandian/giga/service/DownloadManagerService.java

@@ -2,67 +2,114 @@ package us.shandian.giga.service;
 
 import android.Manifest;
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationCompat.Builder;
 import android.support.v4.content.PermissionChecker;
 import android.util.Log;
+import android.util.SparseArray;
 import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.download.DownloadActivity;
-import org.schabi.newpipe.settings.NewPipeSettings;
+import org.schabi.newpipe.player.helper.LockManager;
 
+import java.io.File;
 import java.util.ArrayList;
 
-import us.shandian.giga.get.DownloadDataSource;
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.get.DownloadManagerImpl;
 import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.get.sqlite.SQLiteDownloadDataSource;
+import us.shandian.giga.service.DownloadManager.NetworkState;
 
+import static org.schabi.newpipe.BuildConfig.APPLICATION_ID;
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
 public class DownloadManagerService extends Service {
 
-    private static final String TAG = DownloadManagerService.class.getSimpleName();
+    private static final String TAG = "DownloadManagerService";
 
-    /**
+    public static final int MESSAGE_RUNNING = 0;
-     * Message code of update messages stored as {@link Message#what}.
+    public static final int MESSAGE_PAUSED = 1;
-     */
+    public static final int MESSAGE_FINISHED = 2;
-    private static final int UPDATE_MESSAGE = 0;
+    public static final int MESSAGE_PROGRESS = 3;
-    private static final int NOTIFICATION_ID = 1000;
+    public static final int MESSAGE_ERROR = 4;
+    public static final int MESSAGE_DELETED = 5;
+
+    private static final int FOREGROUND_NOTIFICATION_ID = 1000;
+    private static final int DOWNLOADS_NOTIFICATION_ID = 1001;
+
+    private static final String EXTRA_URLS = "DownloadManagerService.extra.urls";
     private static final String EXTRA_NAME = "DownloadManagerService.extra.name";
     private static final String EXTRA_LOCATION = "DownloadManagerService.extra.location";
-    private static final String EXTRA_IS_AUDIO = "DownloadManagerService.extra.is_audio";
+    private static final String EXTRA_KIND = "DownloadManagerService.extra.kind";
     private static final String EXTRA_THREADS = "DownloadManagerService.extra.threads";
+    private static final String EXTRA_POSTPROCESSING_NAME = "DownloadManagerService.extra.postprocessingName";
+    private static final String EXTRA_POSTPROCESSING_ARGS = "DownloadManagerService.extra.postprocessingArgs";
+    private static final String EXTRA_SOURCE = "DownloadManagerService.extra.source";
+    private static final String EXTRA_NEAR_LENGTH = "DownloadManagerService.extra.nearLength";
 
+    private static final String ACTION_RESET_DOWNLOAD_FINISHED = APPLICATION_ID + ".reset_download_finished";
+    private static final String ACTION_OPEN_DOWNLOADS_FINISHED = APPLICATION_ID + ".open_downloads_finished";
 
     private DMBinder mBinder;
     private DownloadManager mManager;
     private Notification mNotification;
     private Handler mHandler;
-    private long mLastTimeStamp = System.currentTimeMillis();
+    private boolean mForeground = false;
-    private DownloadDataSource mDataSource;
+    private NotificationManager notificationManager = null;
+    private boolean mDownloadNotificationEnable = true;
 
+    private int downloadDoneCount = 0;
+    private Builder downloadDoneNotification = null;
+    private StringBuilder downloadDoneList = null;
 
-    private final MissionListener missionListener = new MissionListener();
+    private final ArrayList<Handler> mEchoObservers = new ArrayList<>(1);
 
+    private BroadcastReceiver mNetworkStateListener;
 
-    private void notifyMediaScanner(DownloadMission mission) {
+    private SharedPreferences mPrefs = null;
-        Uri uri = Uri.parse("file://" + mission.location + "/" + mission.name);
+    private final SharedPreferences.OnSharedPreferenceChangeListener mPrefChangeListener = this::handlePreferenceChange;
-        // notify media scanner on downloaded media file ...
+
-        sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri));
+    private boolean mLockAcquired = false;
+    private LockManager mLock = null;
+
+    private int downloadFailedNotificationID = DOWNLOADS_NOTIFICATION_ID + 1;
+    private Builder downloadFailedNotification = null;
+    private SparseArray<DownloadMission> mFailedDownloads = new SparseArray<>(5);
+
+    private Bitmap icLauncher;
+    private Bitmap icDownloadDone;
+    private Bitmap icDownloadFailed;
+
+    private PendingIntent mOpenDownloadList;
+
+    /**
+     * notify media scanner on downloaded media file ...
+     *
+     * @param file the downloaded file
+     */
+    private void notifyMediaScanner(File file) {
+        sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(file)));
     }
 
     @Override
@@ -74,87 +121,92 @@ public class DownloadManagerService extends Service {
         }
 
         mBinder = new DMBinder();
-        if (mDataSource == null) {
+        mHandler = new Handler(Looper.myLooper()) {
-            mDataSource = new SQLiteDownloadDataSource(this);
+            @Override
-        }
+            public void handleMessage(Message msg) {
-        if (mManager == null) {
+                DownloadManagerService.this.handleMessage(msg);
-            ArrayList<String> paths = new ArrayList<>(2);
-            paths.add(NewPipeSettings.getVideoDownloadPath(this));
-            paths.add(NewPipeSettings.getAudioDownloadPath(this));
-            mManager = new DownloadManagerImpl(paths, mDataSource, this);
-            if (DEBUG) {
-                Log.d(TAG, "mManager == null");
-                Log.d(TAG, "Download directory: " + paths);
             }
-        }
+        };
+
+        mManager = new DownloadManager(this, mHandler);
 
         Intent openDownloadListIntent = new Intent(this, DownloadActivity.class)
                 .setAction(Intent.ACTION_MAIN);
 
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0,
+        mOpenDownloadList = PendingIntent.getActivity(this, 0,
                 openDownloadListIntent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
 
-        Bitmap iconBitmap = BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher);
+        icLauncher = BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher);
 
         Builder builder = new Builder(this, getString(R.string.notification_channel_id))
-                .setContentIntent(pendingIntent)
+                .setContentIntent(mOpenDownloadList)
                 .setSmallIcon(android.R.drawable.stat_sys_download)
-                .setLargeIcon(iconBitmap)
+                .setLargeIcon(icLauncher)
                 .setContentTitle(getString(R.string.msg_running))
                 .setContentText(getString(R.string.msg_running_detail));
 
         mNotification = builder.build();
+        notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
-        HandlerThread thread = new HandlerThread("ServiceMessenger");
+        mNetworkStateListener = new BroadcastReceiver() {
-        thread.start();
-
-        mHandler = new Handler(thread.getLooper()) {
             @Override
-            public void handleMessage(Message msg) {
+            public void onReceive(Context context, Intent intent) {
-                switch (msg.what) {
+                if (intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)) {
-                    case UPDATE_MESSAGE: {
+                    handleConnectivityChange(null);
-                        int runningCount = 0;
+                    return;
-
-                        for (int i = 0; i < mManager.getCount(); i++) {
-                            if (mManager.getMission(i).running) {
-                                runningCount++;
-                            }
-                        }
-                        updateState(runningCount);
-                        break;
-                    }
                 }
+                handleConnectivityChange(intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));
             }
         };
+        registerReceiver(mNetworkStateListener, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
 
-    }
+        mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mPrefs.registerOnSharedPreferenceChangeListener(mPrefChangeListener);
 
-    private void startMissionAsync(final String url, final String location, final String name,
+        handlePreferenceChange(mPrefs, getString(R.string.downloads_cross_network));
-                                   final boolean isAudio, final int threads) {
+        handlePreferenceChange(mPrefs, getString(R.string.downloads_maximum_retry));
-        mHandler.post(new Runnable() {
+
-            @Override
+        mLock = new LockManager(this);
-            public void run() {
-                int missionId = mManager.startMission(url, location, name, isAudio, threads);
-                mBinder.onMissionAdded(mManager.getMission(missionId));
-            }
-        });
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (DEBUG) {
+            if (intent == null) {
+                Log.d(TAG, "Restarting");
+                return START_NOT_STICKY;
+            }
             Log.d(TAG, "Starting");
         }
         Log.i(TAG, "Got intent: " + intent);
         String action = intent.getAction();
-        if (action != null && action.equals(Intent.ACTION_RUN)) {
+        if (action != null) {
-            String name = intent.getStringExtra(EXTRA_NAME);
+            if (action.equals(Intent.ACTION_RUN)) {
-            String location = intent.getStringExtra(EXTRA_LOCATION);
+                String[] urls = intent.getStringArrayExtra(EXTRA_URLS);
-            int threads = intent.getIntExtra(EXTRA_THREADS, 1);
+                String name = intent.getStringExtra(EXTRA_NAME);
-            boolean isAudio = intent.getBooleanExtra(EXTRA_IS_AUDIO, false);
+                String location = intent.getStringExtra(EXTRA_LOCATION);
-            String url = intent.getDataString();
+                int threads = intent.getIntExtra(EXTRA_THREADS, 1);
-            startMissionAsync(url, location, name, isAudio, threads);
+                char kind = intent.getCharExtra(EXTRA_KIND, '?');
+                String psName = intent.getStringExtra(EXTRA_POSTPROCESSING_NAME);
+                String[] psArgs = intent.getStringArrayExtra(EXTRA_POSTPROCESSING_ARGS);
+                String source = intent.getStringExtra(EXTRA_SOURCE);
+                long nearLength = intent.getLongExtra(EXTRA_NEAR_LENGTH, 0);
+
+                mHandler.post(() -> mManager.startMission(urls, location, name, kind, threads, source, psName, psArgs, nearLength));
+
+            } else if (downloadDoneNotification != null) {
+                if (action.equals(ACTION_RESET_DOWNLOAD_FINISHED) || action.equals(ACTION_OPEN_DOWNLOADS_FINISHED)) {
+                    downloadDoneCount = 0;
+                    downloadDoneList.setLength(0);
+                }
+                if (action.equals(ACTION_OPEN_DOWNLOADS_FINISHED)) {
+                    startActivity(new Intent(this, DownloadActivity.class)
+                            .setAction(Intent.ACTION_MAIN)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    );
+                }
+            }
         }
         return START_NOT_STICKY;
     }
@@ -167,11 +219,23 @@ public class DownloadManagerService extends Service {
             Log.d(TAG, "Destroying");
         }
 
-        for (int i = 0; i < mManager.getCount(); i++) {
+        stopForeground(true);
-            mManager.pauseMission(i);
+
+        if (notificationManager != null && downloadDoneNotification != null) {
+            downloadDoneNotification.setDeleteIntent(null);// prevent NewPipe running when is killed, cleared from recent, etc
+            notificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
         }
 
-        stopForeground(true);
+        mManager.pauseAllMissions();
+
+        manageLock(false);
+
+        unregisterReceiver(mNetworkStateListener);
+        mPrefs.unregisterOnSharedPreferenceChangeListener(mPrefChangeListener);
+
+        if (icDownloadDone != null) icDownloadDone.recycle();
+        if (icDownloadFailed != null) icDownloadFailed.recycle();
+        if (icLauncher != null) icLauncher.recycle();
     }
 
     @Override
@@ -192,53 +256,236 @@ public class DownloadManagerService extends Service {
         return mBinder;
     }
 
-    private void postUpdateMessage() {
+    public void handleMessage(Message msg) {
-        mHandler.sendEmptyMessage(UPDATE_MESSAGE);
+        DownloadMission mission = (DownloadMission) msg.obj;
-    }
 
-    private void updateState(int runningCount) {
+        switch (msg.what) {
-        if (runningCount == 0) {
+            case MESSAGE_FINISHED:
-            stopForeground(true);
+                notifyMediaScanner(mission.getDownloadedFile());
-        } else {
+                notifyFinishedDownload(mission.name);
-            startForeground(NOTIFICATION_ID, mNotification);
+                mManager.setFinished(mission);
+                updateForegroundState(mManager.runAnotherMission());
+                break;
+            case MESSAGE_RUNNING:
+            case MESSAGE_PROGRESS:
+                updateForegroundState(true);
+                break;
+            case MESSAGE_ERROR:
+                notifyFailedDownload(mission);
+                updateForegroundState(mManager.runAnotherMission());
+                break;
+            case MESSAGE_PAUSED:
+                updateForegroundState(mManager.getRunningMissionsCount() > 0);
+                break;
+        }
+
+        if (msg.what != MESSAGE_ERROR)
+            mFailedDownloads.delete(mFailedDownloads.indexOfValue(mission));
+
+        synchronized (mEchoObservers) {
+            for (Handler handler : mEchoObservers) {
+                Message echo = new Message();
+                echo.what = msg.what;
+                echo.obj = msg.obj;
+
+                handler.sendMessage(echo);
+            }
         }
     }
 
-    public static void startMission(Context context, String url, String location, String name, boolean isAudio, int threads) {
+    private void handleConnectivityChange(NetworkInfo info) {
+        NetworkState status;
+
+        if (info == null) {
+            status = NetworkState.Unavailable;
+            Log.i(TAG, "actual connectivity status is unavailable");
+        } else if (!info.isAvailable() || !info.isConnected()) {
+            status = NetworkState.Unavailable;
+            Log.i(TAG, "actual connectivity status is not available and not connected");
+        } else {
+            int type = info.getType();
+            if (type == ConnectivityManager.TYPE_MOBILE || type == ConnectivityManager.TYPE_MOBILE_DUN) {
+                status = NetworkState.MobileOperating;
+            } else if (type == ConnectivityManager.TYPE_WIFI) {
+                status = NetworkState.WifiOperating;
+            } else if (type == ConnectivityManager.TYPE_WIMAX ||
+                    type == ConnectivityManager.TYPE_ETHERNET ||
+                    type == ConnectivityManager.TYPE_BLUETOOTH) {
+                status = NetworkState.OtherOperating;
+            } else {
+                status = NetworkState.Unavailable;
+            }
+            Log.i(TAG, "actual connectivity status is " + status.name());
+        }
+
+        if (mManager == null) return;// avoid race-conditions while the service is starting
+        mManager.handleConnectivityChange(status);
+    }
+
+    private void handlePreferenceChange(SharedPreferences prefs, String key) {
+        if (key.equals(getString(R.string.downloads_maximum_retry))) {
+            try {
+                String value = prefs.getString(key, getString(R.string.downloads_maximum_retry_default));
+                mManager.mPrefMaxRetry = Integer.parseInt(value);
+            } catch (Exception e) {
+                mManager.mPrefMaxRetry = 0;
+            }
+            mManager.updateMaximumAttempts();
+        } else if (key.equals(getString(R.string.downloads_cross_network))) {
+            mManager.mPrefCrossNetwork = prefs.getBoolean(key, false);
+        }
+    }
+
+    public void updateForegroundState(boolean state) {
+        if (state == mForeground) return;
+
+        if (state) {
+            startForeground(FOREGROUND_NOTIFICATION_ID, mNotification);
+        } else {
+            stopForeground(true);
+        }
+
+        manageLock(state);
+
+        mForeground = state;
+    }
+
+    public static void startMission(Context context, String urls[], String location, String name, char kind,
+                                    int threads, String source, String psName, String[] psArgs, long nearLength) {
         Intent intent = new Intent(context, DownloadManagerService.class);
         intent.setAction(Intent.ACTION_RUN);
-        intent.setData(Uri.parse(url));
+        intent.putExtra(EXTRA_URLS, urls);
         intent.putExtra(EXTRA_NAME, name);
         intent.putExtra(EXTRA_LOCATION, location);
-        intent.putExtra(EXTRA_IS_AUDIO, isAudio);
+        intent.putExtra(EXTRA_KIND, kind);
         intent.putExtra(EXTRA_THREADS, threads);
+        intent.putExtra(EXTRA_SOURCE, source);
+        intent.putExtra(EXTRA_POSTPROCESSING_NAME, psName);
+        intent.putExtra(EXTRA_POSTPROCESSING_ARGS, psArgs);
+        intent.putExtra(EXTRA_NEAR_LENGTH, nearLength);
         context.startService(intent);
     }
 
+    public static void checkForRunningMission(Context context, String location, String name, DMChecker check) {
+        Intent intent = new Intent();
+        intent.setClass(context, DownloadManagerService.class);
+        context.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName cname, IBinder service) {
+                try {
+                    ((DMBinder) service).getDownloadManager().checkForRunningMission(location, name, check);
+                } catch (Exception err) {
+                    Log.w(TAG, "checkForRunningMission() callback is defective", err);
+                }
 
-    private class MissionListener implements DownloadMission.MissionListener {
+                // TODO: find a efficient way to unbind the service. This destroy the service due idle, but is started again when the user start a download.
-        @Override
+                context.unbindService(this);
-        public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
-            long now = System.currentTimeMillis();
-            long delta = now - mLastTimeStamp;
-            if (delta > 2000) {
-                postUpdateMessage();
-                mLastTimeStamp = now;
             }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+            }
+        }, Context.BIND_AUTO_CREATE);
+    }
+
+    public void notifyFinishedDownload(String name) {
+        if (!mDownloadNotificationEnable || notificationManager == null) {
+            return;
         }
 
-        @Override
+        if (downloadDoneNotification == null) {
-        public void onFinish(DownloadMission downloadMission) {
+            downloadDoneList = new StringBuilder(name.length());
-            postUpdateMessage();
+
-            notifyMediaScanner(downloadMission);
+            icDownloadDone = BitmapFactory.decodeResource(this.getResources(), android.R.drawable.stat_sys_download_done);
+            downloadDoneNotification = new Builder(this, getString(R.string.notification_channel_id))
+                    .setAutoCancel(true)
+                    .setLargeIcon(icDownloadDone)
+                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
+                    .setDeleteIntent(makePendingIntent(ACTION_RESET_DOWNLOAD_FINISHED))
+                    .setContentIntent(makePendingIntent(ACTION_OPEN_DOWNLOADS_FINISHED));
         }
 
-        @Override
+        if (downloadDoneCount < 1) {
-        public void onError(DownloadMission downloadMission, int errCode) {
+            downloadDoneList.append(name);
-            postUpdateMessage();
+
+            if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                downloadDoneNotification.setContentTitle(getString(R.string.app_name));
+            } else {
+                downloadDoneNotification.setContentTitle(null);
+            }
+
+            downloadDoneNotification.setContentText(getString(R.string.download_finished));
+            downloadDoneNotification.setStyle(new NotificationCompat.BigTextStyle()
+                    .setBigContentTitle(getString(R.string.download_finished))
+                    .bigText(name)
+            );
+        } else {
+            downloadDoneList.append('\n');
+            downloadDoneList.append(name);
+
+            downloadDoneNotification.setStyle(new NotificationCompat.BigTextStyle().bigText(downloadDoneList));
+            downloadDoneNotification.setContentTitle(getString(R.string.download_finished_more, String.valueOf(downloadDoneCount + 1)));
+            downloadDoneNotification.setContentText(downloadDoneList);
+        }
+
+        notificationManager.notify(DOWNLOADS_NOTIFICATION_ID, downloadDoneNotification.build());
+        downloadDoneCount++;
+    }
+
+    public void notifyFailedDownload(DownloadMission mission) {
+        if (!mDownloadNotificationEnable || mFailedDownloads.indexOfValue(mission) >= 0) return;
+
+        int id = downloadFailedNotificationID++;
+        mFailedDownloads.put(id, mission);
+
+        if (downloadFailedNotification == null) {
+            icDownloadFailed = BitmapFactory.decodeResource(this.getResources(), android.R.drawable.stat_sys_warning);
+            downloadFailedNotification = new Builder(this, getString(R.string.notification_channel_id))
+                    .setAutoCancel(true)
+                    .setLargeIcon(icDownloadFailed)
+                    .setSmallIcon(android.R.drawable.stat_sys_warning)
+                    .setContentIntent(mOpenDownloadList);
+        }
+
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            downloadFailedNotification.setContentTitle(getString(R.string.app_name));
+            downloadFailedNotification.setStyle(new NotificationCompat.BigTextStyle()
+                    .bigText(getString(R.string.download_failed).concat(": ").concat(mission.name)));
+        } else {
+            downloadFailedNotification.setContentTitle(getString(R.string.download_failed));
+            downloadFailedNotification.setContentText(mission.name);
+            downloadFailedNotification.setStyle(new NotificationCompat.BigTextStyle()
+                    .bigText(mission.name));
+        }
+
+        notificationManager.notify(id, downloadFailedNotification.build());
+    }
+
+    private PendingIntent makePendingIntent(String action) {
+        Intent intent = new Intent(this, DownloadManagerService.class).setAction(action);
+        return PendingIntent.getService(this, intent.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+
+    private void manageObservers(Handler handler, boolean add) {
+        synchronized (mEchoObservers) {
+            if (add) {
+                mEchoObservers.add(handler);
+            } else {
+                mEchoObservers.remove(handler);
+            }
         }
     }
 
+    private void manageLock(boolean acquire) {
+        if (acquire == mLockAcquired) return;
+
+        if (acquire)
+            mLock.acquireWifiAndCpu();
+        else
+            mLock.releaseWifiAndCpu();
+
+        mLockAcquired = acquire;
+    }
 
     // Wrapper of DownloadManager
     public class DMBinder extends Binder {
@@ -246,14 +493,38 @@ public class DownloadManagerService extends Service {
             return mManager;
         }
 
-        public void onMissionAdded(DownloadMission mission) {
+        public void addMissionEventListener(Handler handler) {
-            mission.addListener(missionListener);
+            manageObservers(handler, true);
-            postUpdateMessage();
         }
 
-        public void onMissionRemoved(DownloadMission mission) {
+        public void removeMissionEventListener(Handler handler) {
-            mission.removeListener(missionListener);
+            manageObservers(handler, false);
-            postUpdateMessage();
         }
+
+        public void clearDownloadNotifications() {
+            if (notificationManager == null) return;
+            if (downloadDoneNotification != null) {
+                notificationManager.cancel(DOWNLOADS_NOTIFICATION_ID);
+                downloadDoneList.setLength(0);
+                downloadDoneCount = 0;
+            }
+            if (downloadFailedNotification != null) {
+                for (; downloadFailedNotificationID > DOWNLOADS_NOTIFICATION_ID; downloadFailedNotificationID--) {
+                    notificationManager.cancel(downloadFailedNotificationID);
+                }
+                mFailedDownloads.clear();
+                downloadFailedNotificationID++;
+            }
+        }
+
+        public void enableNotifications(boolean enable) {
+            mDownloadNotificationEnable = enable;
+        }
+
     }
+
+    public interface DMChecker {
+        void callback(boolean listed, boolean finished);
+    }
+
 }

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

@@ -1,5 +1,6 @@
 package us.shandian.giga.ui.adapter;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -7,12 +8,21 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.FileProvider;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.util.DiffUtil;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.RecyclerView.Adapter;
 import android.util.Log;
+import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -24,268 +34,290 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.download.DeleteDownloadManager;
+import org.schabi.newpipe.util.NavigationHelper;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
 
-import us.shandian.giga.get.DownloadManager;
 import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.service.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.ui.common.Deleter;
 import us.shandian.giga.ui.common.ProgressDrawable;
 import us.shandian.giga.util.Utility;
 
 import static android.content.Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
 import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
+import static us.shandian.giga.get.DownloadMission.ERROR_CONNECT_HOST;
+import static us.shandian.giga.get.DownloadMission.ERROR_FILE_CREATION;
+import static us.shandian.giga.get.DownloadMission.ERROR_HTTP_NO_CONTENT;
+import static us.shandian.giga.get.DownloadMission.ERROR_HTTP_UNSUPPORTED_RANGE;
+import static us.shandian.giga.get.DownloadMission.ERROR_NOTHING;
+import static us.shandian.giga.get.DownloadMission.ERROR_PATH_CREATION;
+import static us.shandian.giga.get.DownloadMission.ERROR_PERMISSION_DENIED;
+import static us.shandian.giga.get.DownloadMission.ERROR_POSTPROCESSING;
+import static us.shandian.giga.get.DownloadMission.ERROR_SSL_EXCEPTION;
+import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_HOST;
 
-public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHolder> {
+public class MissionAdapter extends Adapter<ViewHolder> {
-    private static final Map<Integer, String> ALGORITHMS = new HashMap<>();
+    private static final SparseArray<String> ALGORITHMS = new SparseArray<>();
     private static final String TAG = "MissionAdapter";
+    private static final String UNDEFINED_PROGRESS = "--.-%";
+
 
     static {
         ALGORITHMS.put(R.id.md5, "MD5");
         ALGORITHMS.put(R.id.sha1, "SHA1");
     }
 
-    private Activity mContext;
+    private Context mContext;
     private LayoutInflater mInflater;
     private DownloadManager mDownloadManager;
-    private DeleteDownloadManager mDeleteDownloadManager;
+    private Deleter mDeleter;
-    private List<DownloadMission> mItemList;
-    private DownloadManagerService.DMBinder mBinder;
     private int mLayout;
+    private DownloadManager.MissionIterator mIterator;
+    private ArrayList<ViewHolderItem> mPendingDownloadsItems = new ArrayList<>();
+    private Handler mHandler;
+    private MenuItem mClear;
+    private View mEmptyMessage;
 
-    public MissionAdapter(Activity context, DownloadManagerService.DMBinder binder, DownloadManager downloadManager, DeleteDownloadManager deleteDownloadManager, boolean isLinear) {
+    public MissionAdapter(Context context, DownloadManager downloadManager, MenuItem clearButton, View emptyMessage) {
         mContext = context;
         mDownloadManager = downloadManager;
-        mDeleteDownloadManager = deleteDownloadManager;
+        mDeleter = null;
-        mBinder = binder;
 
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mLayout = isLinear ? R.layout.mission_item_linear : R.layout.mission_item;
+        mLayout = R.layout.mission_item;
 
-        mItemList = new ArrayList<>();
+        mHandler = new Handler(Looper.myLooper()) {
-        updateItemList();
+            @Override
+            public void handleMessage(Message msg) {
+                switch (msg.what) {
+                    case DownloadManagerService.MESSAGE_PROGRESS:
+                    case DownloadManagerService.MESSAGE_ERROR:
+                    case DownloadManagerService.MESSAGE_FINISHED:
+                        onServiceMessage(msg);
+                        break;
+                }
+            }
+        };
+
+        mClear = clearButton;
+        mEmptyMessage = emptyMessage;
+
+        mIterator = downloadManager.getIterator();
+
+        checkEmptyMessageVisibility();
     }
 
-    public void updateItemList() {
+    @Override
-        mItemList.clear();
+    @NonNull
-
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        for (int i = 0; i < mDownloadManager.getCount(); i++) {
+        switch (viewType) {
-            DownloadMission mission = mDownloadManager.getMission(i);
+            case DownloadManager.SPECIAL_PENDING:
-            if (!mDeleteDownloadManager.contains(mission)) {
+            case DownloadManager.SPECIAL_FINISHED:
-                mItemList.add(mDownloadManager.getMission(i));
+                return new ViewHolderHeader(mInflater.inflate(R.layout.missions_header, parent, false));
-            }
         }
+
+        return new ViewHolderItem(mInflater.inflate(mLayout, parent, false));
     }
 
     @Override
-    public MissionAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public void onViewRecycled(@NonNull ViewHolder view) {
-        final ViewHolder h = new ViewHolder(mInflater.inflate(mLayout, parent, false));
+        super.onViewRecycled(view);
 
-        h.menu.setOnClickListener(new View.OnClickListener() {
+        if (view instanceof ViewHolderHeader) return;
-            @Override
+        ViewHolderItem h = (ViewHolderItem) view;
-            public void onClick(View v) {
-                buildPopup(h);
-            }
-        });
 
-		h.itemView.setOnClickListener(new View.OnClickListener() {
+        if (h.item.mission instanceof DownloadMission) {
-            @Override
+            mPendingDownloadsItems.remove(h);
-			public void onClick(View v) {
+            if (mPendingDownloadsItems.size() < 1) setAutoRefresh(false);
-                if(h.mission.finished) viewFile(h);
+        }
-			}
-		});
 
-        return h;
+        h.popupMenu.dismiss();
-    }
+        h.item = null;
-
-    @Override
-    public void onViewRecycled(MissionAdapter.ViewHolder h) {
-        super.onViewRecycled(h);
-        h.mission.removeListener(h.observer);
-        h.mission = null;
-        h.observer = null;
-        h.progress = null;
-        h.position = -1;
         h.lastTimeStamp = -1;
         h.lastDone = -1;
-        h.colorId = 0;
+        h.lastCurrent = -1;
+        h.state = 0;
     }
 
     @Override
-    public void onBindViewHolder(MissionAdapter.ViewHolder h, int pos) {
+    @SuppressLint("SetTextI18n")
-        DownloadMission ms = mItemList.get(pos);
+    public void onBindViewHolder(@NonNull ViewHolder view, @SuppressLint("RecyclerView") int pos) {
-        h.mission = ms;
+        DownloadManager.MissionItem item = mIterator.getItem(pos);
-        h.position = pos;
 
-        Utility.FileType type = Utility.getFileType(ms.name);
+        if (view instanceof ViewHolderHeader) {
+            if (item.special == DownloadManager.SPECIAL_NOTHING) return;
+            int str;
+            if (item.special == DownloadManager.SPECIAL_PENDING) {
+                str = R.string.missions_header_pending;
+            } else {
+                str = R.string.missions_header_finished;
+                if (mClear != null) mClear.setVisible(true);
+            }
+
+            ((ViewHolderHeader) view).header.setText(str);
+            return;
+        }
+
+        ViewHolderItem h = (ViewHolderItem) view;
+        h.item = item;
+
+        Utility.FileType type = Utility.getFileType(item.mission.kind, item.mission.name);
 
         h.icon.setImageResource(Utility.getIconForFileType(type));
-        h.name.setText(ms.name);
+        h.name.setText(item.mission.name);
-        h.size.setText(Utility.formatBytes(ms.length));
 
-        h.progress = new ProgressDrawable(mContext, Utility.getBackgroundForFileType(type), Utility.getForegroundForFileType(type));
+        h.progress.setColors(Utility.getBackgroundForFileType(mContext, type), Utility.getForegroundForFileType(mContext, type));
-        ViewCompat.setBackground(h.bkg, h.progress);
 
-        h.observer = new MissionObserver(this, h);
+        if (h.item.mission instanceof DownloadMission) {
-        ms.addListener(h.observer);
+            DownloadMission mission = (DownloadMission) item.mission;
+            String length = Utility.formatBytes(mission.getLength());
+            if (mission.running && !mission.isPsRunning()) length += " --.- kB/s";
 
-        updateProgress(h);
+            h.size.setText(length);
+            h.pause.setTitle(mission.unknownLength ? R.string.stop : R.string.pause);
+            h.lastCurrent = mission.current;
+            updateProgress(h);
+            mPendingDownloadsItems.add(h);
+        } else {
+            h.progress.setMarquee(false);
+            h.status.setText("100%");
+            h.progress.setProgress(1f);
+            h.size.setText(Utility.formatBytes(item.mission.length));
+        }
     }
 
     @Override
     public int getItemCount() {
-        return mItemList.size();
+        return mIterator.getOldListSize();
     }
 
     @Override
-    public long getItemId(int position) {
+    public int getItemViewType(int position) {
-        return position;
+        return mIterator.getSpecialAtItem(position);
     }
 
-    private void updateProgress(ViewHolder h) {
+    @SuppressLint("DefaultLocale")
-        updateProgress(h, false);
+    private void updateProgress(ViewHolderItem h) {
-    }
+        if (h == null || h.item == null || h.item.mission instanceof FinishedMission) return;
-
-    private void updateProgress(ViewHolder h, boolean finished) {
-        if (h.mission == null) return;
 
         long now = System.currentTimeMillis();
+        DownloadMission mission = (DownloadMission) h.item.mission;
 
-        if (h.lastTimeStamp == -1) {
+        if (h.lastCurrent != mission.current) {
+            h.lastCurrent = mission.current;
             h.lastTimeStamp = now;
-        }
+            h.lastDone = 0;
-
+        } else {
-        if (h.lastDone == -1) {
+            if (h.lastTimeStamp == -1) h.lastTimeStamp = now;
-            h.lastDone = h.mission.done;
+            if (h.lastDone == -1) h.lastDone = mission.done;
         }
 
         long deltaTime = now - h.lastTimeStamp;
-        long deltaDone = h.mission.done - h.lastDone;
+        long deltaDone = mission.done - h.lastDone;
+        boolean hasError = mission.errCode != ERROR_NOTHING;
 
-        if (deltaTime == 0 || deltaTime > 1000 || finished) {
+        // on error hide marquee or show if condition (mission.done < 1 || mission.unknownLength) is true
-            if (h.mission.errCode > 0) {
+        h.progress.setMarquee(!hasError && (mission.done < 1 || mission.unknownLength));
-                h.status.setText(R.string.msg_error);
+
-            } else {
+        float progress;
-                float progress = (float) h.mission.done / h.mission.length;
+        if (mission.unknownLength) {
-                h.status.setText(String.format(Locale.US, "%.2f%%", progress * 100));
+            progress = Float.NaN;
-                h.progress.setProgress(progress);
+            h.progress.setProgress(0f);
+        } else {
+            progress = (float) ((double) mission.done / mission.length);
+            if (mission.urls.length > 1 && mission.current < mission.urls.length) {
+                progress = (progress / mission.urls.length) + ((float) mission.current / mission.urls.length);
             }
         }
 
-        if (deltaTime > 1000 && deltaDone > 0) {
+        if (hasError) {
-            float speed = (float) deltaDone / deltaTime;
+            h.progress.setProgress(isNotFinite(progress) ? 1f : progress);
-            String speedStr = Utility.formatSpeed(speed * 1000);
+            h.status.setText(R.string.msg_error);
-            String sizeStr = Utility.formatBytes(h.mission.length);
+        } else if (isNotFinite(progress)) {
+            h.status.setText(UNDEFINED_PROGRESS);
+        } else {
+            h.status.setText(String.format("%.2f%%", progress * 100));
+            h.progress.setProgress(progress);
+        }
 
-            h.size.setText(sizeStr + " " + speedStr);
+        long length = mission.getLength();
+
+        int state;
+        if (mission.isPsFailed()) {
+            state = 0;
+        } else if (!mission.running) {
+            state = mission.enqueued ? 1 : 2;
+        } else if (mission.isPsRunning()) {
+            state = 3;
+        } else {
+            state = 0;
+        }
+
+        if (state != 0) {
+            // update state without download speed
+            if (h.state != state) {
+                String statusStr;
+                h.state = state;
+
+                switch (state) {
+                    case 1:
+                        statusStr = mContext.getString(R.string.queued);
+                        break;
+                    case 2:
+                        statusStr = mContext.getString(R.string.paused);
+                        break;
+                    case 3:
+                        statusStr = mContext.getString(R.string.post_processing);
+                        break;
+                    default:
+                        statusStr = "?";
+                        break;
+                }
+
+                h.size.setText(Utility.formatBytes(length).concat("  (").concat(statusStr).concat(")"));
+            } else if (deltaDone > 0) {
+                h.lastTimeStamp = now;
+                h.lastDone = mission.done;
+            }
+
+            return;
+        }
+
+        if (deltaDone > 0 && deltaTime > 0) {
+            float speed = (deltaDone * 1000f) / deltaTime;
+
+            String speedStr = Utility.formatSpeed(speed);
+            String sizeStr = Utility.formatBytes(length);
+
+            h.size.setText(sizeStr.concat(" ").concat(speedStr));
 
             h.lastTimeStamp = now;
-            h.lastDone = h.mission.done;
+            h.lastDone = mission.done;
         }
     }
 
+    private boolean viewWithFileProvider(@NonNull File file) {
+        if (!file.exists()) return true;
 
-    private void buildPopup(final ViewHolder h) {
+        String ext = Utility.getFileExt(file.getName());
-        PopupMenu popup = new PopupMenu(mContext, h.menu);
+        if (ext == null) return false;
-        popup.inflate(R.menu.mission);
 
-        Menu menu = popup.getMenu();
+        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-        MenuItem start = menu.findItem(R.id.start);
+        Log.v(TAG, "Mime: " + mimeType + " package: " + BuildConfig.APPLICATION_ID + ".provider");
-        MenuItem pause = menu.findItem(R.id.pause);
-        MenuItem delete = menu.findItem(R.id.delete);
-        MenuItem checksum = menu.findItem(R.id.checksum);
 
-        // Set to false first
+        Uri uri = FileProvider.getUriForFile(mContext, BuildConfig.APPLICATION_ID + ".provider", file);
-        start.setVisible(false);
-        pause.setVisible(false);
-        delete.setVisible(false);
-        checksum.setVisible(false);
 
-        if (!h.mission.finished) {
-            if (!h.mission.running) {
-                if (h.mission.errCode == -1) {
-                    start.setVisible(true);
-                }
-
-                delete.setVisible(true);
-            } else {
-                pause.setVisible(true);
-            }
-        } else {
-            delete.setVisible(true);
-            checksum.setVisible(true);
-        }
-
-        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                int id = item.getItemId();
-                switch (id) {
-                    case R.id.start:
-                        mDownloadManager.resumeMission(h.position);
-                        mBinder.onMissionAdded(mItemList.get(h.position));
-                        return true;
-                    case R.id.pause:
-                        mDownloadManager.pauseMission(h.position);
-                        mBinder.onMissionRemoved(mItemList.get(h.position));
-                        h.lastTimeStamp = -1;
-                        h.lastDone = -1;
-                        return true;
-                    case R.id.delete:
-                        mDeleteDownloadManager.add(h.mission);
-                        updateItemList();
-                        notifyDataSetChanged();
-                        return true;
-                    case R.id.md5:
-                    case R.id.sha1:
-                        DownloadMission mission = mItemList.get(h.position);
-                        new ChecksumTask(mContext).execute(mission.location + "/" + mission.name, ALGORITHMS.get(id));
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-        });
-
-        popup.show();
-    }
-
-    private boolean viewFile(ViewHolder h) {
-        File f = new File(h.mission.location, h.mission.name);
-        String ext = Utility.getFileExt(h.mission.name);
-
-        Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
-
-        if (ext == null) {
-            Log.w(TAG, "Can't view file because it has no extension: " +
-                    h.mission.name);
-            return true;
-        }
-
-        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-        Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
-        if (f.exists()) {
-            viewFileWithFileProvider(f, mime);
-        } else {
-            Log.w(TAG, "File doesn't exist");
-        }
-        return false;
-    }
-
-    private void viewFileWithFileProvider(File file, String mimetype) {
-        String ourPackage = mContext.getApplicationContext().getPackageName();
-        Uri uri = FileProvider.getUriForFile(mContext, ourPackage + ".provider", file);
         Intent intent = new Intent();
         intent.setAction(Intent.ACTION_VIEW);
-        intent.setDataAndType(uri, mimetype);
+        intent.setDataAndType(uri, mimeType);
         intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
@@ -298,75 +330,391 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
             Toast noPlayerToast = Toast.makeText(mContext, R.string.toast_no_player, Toast.LENGTH_LONG);
             noPlayerToast.show();
         }
+
+        return true;
     }
 
-    static class ViewHolder extends RecyclerView.ViewHolder {
+    public Handler getMessenger() {
-        public DownloadMission mission;
+        return mHandler;
-        public int position;
+    }
 
-        public final TextView status;
+    private void onServiceMessage(@NonNull Message msg) {
-        public final ImageView icon;
+        switch (msg.what) {
-        public final TextView name;
+            case DownloadManagerService.MESSAGE_PROGRESS:
-        public final TextView size;
+                setAutoRefresh(true);
-        public final View bkg;
+                return;
-        public final ImageView menu;
+            case DownloadManagerService.MESSAGE_ERROR:
-        public ProgressDrawable progress;
+            case DownloadManagerService.MESSAGE_FINISHED:
-        public MissionObserver observer;
+                break;
+            default:
+                return;
+        }
 
-        public long lastTimeStamp = -1;
+        for (int i = 0; i < mPendingDownloadsItems.size(); i++) {
-        public long lastDone = -1;
+            ViewHolderItem h = mPendingDownloadsItems.get(i);
-        public int colorId;
+            if (h.item.mission != msg.obj) continue;
 
-        public ViewHolder(View v) {
+            if (msg.what == DownloadManagerService.MESSAGE_FINISHED) {
-            super(v);
+                // DownloadManager should mark the download as finished
+                applyChanges();
+                return;
+            }
 
-            status = v.findViewById(R.id.item_status);
+            updateProgress(h);
-            icon = v.findViewById(R.id.item_icon);
+            return;
-            name = v.findViewById(R.id.item_name);
-            size = v.findViewById(R.id.item_size);
-            bkg = v.findViewById(R.id.item_bkg);
-            menu = v.findViewById(R.id.item_more);
         }
     }
 
-    static class MissionObserver implements DownloadMission.MissionListener {
+    private void showError(@NonNull DownloadMission mission) {
-        private final MissionAdapter mAdapter;
+        StringBuilder str = new StringBuilder();
-        private final ViewHolder mHolder;
+        str.append(mContext.getString(R.string.label_code));
+        str.append(": ");
+        str.append(mission.errCode);
+        str.append('\n');
 
-        public MissionObserver(MissionAdapter adapter, ViewHolder holder) {
+        switch (mission.errCode) {
-            mAdapter = adapter;
+            case 416:
-            mHolder = holder;
+                str.append(mContext.getString(R.string.error_http_requested_range_not_satisfiable));
+                break;
+            case 404:
+                str.append(mContext.getString(R.string.error_http_not_found));
+                break;
+            case ERROR_NOTHING:
+                str.append("¿?");
+                break;
+            case ERROR_FILE_CREATION:
+                str.append(mContext.getString(R.string.error_file_creation));
+                break;
+            case ERROR_HTTP_NO_CONTENT:
+                str.append(mContext.getString(R.string.error_http_no_content));
+                break;
+            case ERROR_HTTP_UNSUPPORTED_RANGE:
+                str.append(mContext.getString(R.string.error_http_unsupported_range));
+                break;
+            case ERROR_PATH_CREATION:
+                str.append(mContext.getString(R.string.error_path_creation));
+                break;
+            case ERROR_PERMISSION_DENIED:
+                str.append(mContext.getString(R.string.permission_denied));
+                break;
+            case ERROR_SSL_EXCEPTION:
+                str.append(mContext.getString(R.string.error_ssl_exception));
+                break;
+            case ERROR_UNKNOWN_HOST:
+                str.append(mContext.getString(R.string.error_unknown_host));
+                break;
+            case ERROR_CONNECT_HOST:
+                str.append(mContext.getString(R.string.error_connect_host));
+                break;
+            case ERROR_POSTPROCESSING:
+                str.append(mContext.getString(R.string.error_postprocessing_failed));
+            case ERROR_UNKNOWN_EXCEPTION:
+                break;
+            default:
+                if (mission.errCode >= 100 && mission.errCode < 600) {
+                    str = new StringBuilder(8);
+                    str.append("HTTP ");
+                    str.append(mission.errCode);
+                } else if (mission.errObject == null) {
+                    str.append("(not_decelerated_error_code)");
+                }
+                break;
         }
 
-        @Override
+        if (mission.errObject != null) {
-        public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+            str.append("\n\n");
-            mAdapter.updateProgress(mHolder);
+            str.append(mission.errObject.toString());
         }
 
-        @Override
+        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-        public void onFinish(DownloadMission downloadMission) {
+        builder.setTitle(mission.name)
-            //mAdapter.mManager.deleteMission(mHolder.position);
+                .setMessage(str)
-            // TODO Notification
+                .setNegativeButton(android.R.string.ok, (dialog, which) -> dialog.cancel())
-            //mAdapter.notifyDataSetChanged();
+                .create()
-            if (mHolder.mission != null) {
+                .show();
-                mHolder.size.setText(Utility.formatBytes(mHolder.mission.length));
+    }
-                mAdapter.updateProgress(mHolder, true);
+
+    public void clearFinishedDownloads() {
+        mDownloadManager.forgetFinishedDownloads();
+        applyChanges();
+    }
+
+    private boolean handlePopupItem(@NonNull ViewHolderItem h, @NonNull MenuItem option) {
+        int id = option.getItemId();
+        DownloadMission mission = h.item.mission instanceof DownloadMission ? (DownloadMission) h.item.mission : null;
+
+        if (mission != null) {
+            switch (id) {
+                case R.id.start:
+                    h.status.setText(UNDEFINED_PROGRESS);
+                    h.state = -1;
+                    h.size.setText(Utility.formatBytes(mission.getLength()));
+                    mDownloadManager.resumeMission(mission);
+                    return true;
+                case R.id.pause:
+                    h.state = -1;
+                    mDownloadManager.pauseMission(mission);
+                    updateProgress(h);
+                    h.lastTimeStamp = -1;
+                    h.lastDone = -1;
+                    return true;
+                case R.id.error_message_view:
+                    showError(mission);
+                    return true;
+                case R.id.queue:
+                    h.queue.setChecked(!h.queue.isChecked());
+                    mission.enqueued = h.queue.isChecked();
+                    updateProgress(h);
+                    return true;
             }
         }
 
-        @Override
+        switch (id) {
-        public void onError(DownloadMission downloadMission, int errCode) {
+            case R.id.open:
-            mAdapter.updateProgress(mHolder);
+                return viewWithFileProvider(h.item.mission.getDownloadedFile());
+            case R.id.delete:
+                if (mDeleter == null) {
+                    mDownloadManager.deleteMission(h.item.mission);
+                } else {
+                    mDeleter.append(h.item.mission);
+                }
+                applyChanges();
+                return true;
+            case R.id.md5:
+            case R.id.sha1:
+                new ChecksumTask(mContext).execute(h.item.mission.getDownloadedFile().getAbsolutePath(), ALGORITHMS.get(id));
+                return true;
+            case R.id.source:
+                /*Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(h.item.mission.source));
+                mContext.startActivity(intent);*/
+                try {
+                    Intent intent = NavigationHelper.getIntentByLink(mContext, h.item.mission.source);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP);
+                    mContext.startActivity(intent);
+                } catch (Exception e) {
+                    Log.w(TAG, "Selected item has a invalid source", e);
+                }
+                return true;
+            default:
+                return false;
         }
-
     }
 
-    private static class ChecksumTask extends AsyncTask<String, Void, String> {
+    public void applyChanges() {
-        ProgressDialog prog;
+        mIterator.start();
-        final WeakReference<Activity> weakReference;
+        DiffUtil.calculateDiff(mIterator, true).dispatchUpdatesTo(this);
+        mIterator.end();
 
-        ChecksumTask(@NonNull Activity activity) {
+        checkEmptyMessageVisibility();
-            weakReference = new WeakReference<>(activity);
+        if (mClear != null) mClear.setVisible(mIterator.hasFinishedMissions());
+    }
+
+    public void forceUpdate() {
+        mIterator.start();
+        mIterator.end();
+
+        for (ViewHolderItem item : mPendingDownloadsItems) {
+            item.lastTimeStamp = -1;
+        }
+
+        notifyDataSetChanged();
+    }
+
+    public void setLinear(boolean isLinear) {
+        mLayout = isLinear ? R.layout.mission_item_linear : R.layout.mission_item;
+    }
+
+    public void setClearButton(MenuItem clearButton) {
+        if (mClear == null) clearButton.setVisible(mIterator.hasFinishedMissions());
+        mClear = clearButton;
+    }
+
+    private void checkEmptyMessageVisibility() {
+        int flag = mIterator.getOldListSize() > 0 ? View.GONE : View.VISIBLE;
+        if (mEmptyMessage.getVisibility() != flag) mEmptyMessage.setVisibility(flag);
+    }
+
+
+    public void deleterDispose(Bundle bundle) {
+        if (mDeleter != null) mDeleter.dispose(bundle);
+    }
+
+    public void deleterLoad(Bundle bundle, View view) {
+        if (mDeleter == null)
+            mDeleter = new Deleter(bundle, view, mContext, this, mDownloadManager, mIterator, mHandler);
+    }
+
+    public void deleterResume() {
+        if (mDeleter != null) mDeleter.resume();
+    }
+
+
+    private boolean mUpdaterRunning = false;
+    private final Runnable rUpdater = this::updater;
+
+    public void onPaused() {
+        setAutoRefresh(false);
+    }
+
+    private void setAutoRefresh(boolean enabled) {
+        if (enabled && !mUpdaterRunning) {
+            mUpdaterRunning = true;
+            updater();
+        } else if (!enabled && mUpdaterRunning) {
+            mUpdaterRunning = false;
+            mHandler.removeCallbacks(rUpdater);
+        }
+    }
+
+    private void updater() {
+        if (!mUpdaterRunning) return;
+
+        boolean running = false;
+        for (ViewHolderItem h : mPendingDownloadsItems) {
+            // check if the mission is running first
+            if (!((DownloadMission) h.item.mission).running) continue;
+
+            updateProgress(h);
+            running = true;
+        }
+
+        if (running) {
+            mHandler.postDelayed(rUpdater, 1000);
+        } else {
+            mUpdaterRunning = false;
+        }
+    }
+
+    private boolean isNotFinite(Float value) {
+        return Float.isNaN(value) || Float.isInfinite(value);
+    }
+
+
+    class ViewHolderItem extends RecyclerView.ViewHolder {
+        DownloadManager.MissionItem item;
+
+        TextView status;
+        ImageView icon;
+        TextView name;
+        TextView size;
+        ProgressDrawable progress;
+
+        PopupMenu popupMenu;
+        MenuItem start;
+        MenuItem pause;
+        MenuItem open;
+        MenuItem queue;
+        MenuItem showError;
+        MenuItem delete;
+        MenuItem source;
+        MenuItem checksum;
+
+        long lastTimeStamp = -1;
+        long lastDone = -1;
+        int lastCurrent = -1;
+        int state = 0;
+
+        ViewHolderItem(View view) {
+            super(view);
+
+            progress = new ProgressDrawable();
+            ViewCompat.setBackground(itemView.findViewById(R.id.item_bkg), progress);
+
+            status = itemView.findViewById(R.id.item_status);
+            name = itemView.findViewById(R.id.item_name);
+            icon = itemView.findViewById(R.id.item_icon);
+            size = itemView.findViewById(R.id.item_size);
+
+            name.setSelected(true);
+
+            ImageView button = itemView.findViewById(R.id.item_more);
+            popupMenu = buildPopup(button);
+            button.setOnClickListener(v -> showPopupMenu());
+
+            Menu menu = popupMenu.getMenu();
+            start = menu.findItem(R.id.start);
+            pause = menu.findItem(R.id.pause);
+            open = menu.findItem(R.id.open);
+            queue = menu.findItem(R.id.queue);
+            showError = menu.findItem(R.id.error_message_view);
+            delete = menu.findItem(R.id.delete);
+            source = menu.findItem(R.id.source);
+            checksum = menu.findItem(R.id.checksum);
+
+            itemView.setOnClickListener((v) -> {
+                if (item.mission instanceof FinishedMission)
+                    viewWithFileProvider(item.mission.getDownloadedFile());
+            });
+        }
+
+        private void showPopupMenu() {
+            start.setVisible(false);
+            pause.setVisible(false);
+            open.setVisible(false);
+            queue.setVisible(false);
+            showError.setVisible(false);
+            delete.setVisible(false);
+            source.setVisible(false);
+            checksum.setVisible(false);
+
+            DownloadMission mission = item.mission instanceof DownloadMission ? (DownloadMission) item.mission : null;
+
+            if (mission != null) {
+                if (!mission.isPsRunning()) {
+                    if (mission.running) {
+                        pause.setVisible(true);
+                    } else {
+                        if (mission.errCode != ERROR_NOTHING) {
+                            showError.setVisible(true);
+                        }
+
+                        queue.setChecked(mission.enqueued);
+
+                        delete.setVisible(true);
+
+                        boolean flag = !mission.isPsFailed();
+                        start.setVisible(flag);
+                        queue.setVisible(flag);
+                    }
+                }
+            } else {
+                open.setVisible(true);
+                delete.setVisible(true);
+                checksum.setVisible(true);
+            }
+
+            if (item.mission.source != null && !item.mission.source.isEmpty()) {
+                source.setVisible(true);
+            }
+
+            popupMenu.show();
+        }
+
+        private PopupMenu buildPopup(final View button) {
+            PopupMenu popup = new PopupMenu(mContext, button);
+            popup.inflate(R.menu.mission);
+            popup.setOnMenuItemClickListener(option -> handlePopupItem(this, option));
+
+            return popup;
+        }
+    }
+
+    class ViewHolderHeader extends RecyclerView.ViewHolder {
+        TextView header;
+
+        ViewHolderHeader(View view) {
+            super(view);
+            header = itemView.findViewById(R.id.item_name);
+        }
+    }
+
+
+    static class ChecksumTask extends AsyncTask<String, Void, String> {
+        ProgressDialog progressDialog;
+        WeakReference<Activity> weakReference;
+
+        ChecksumTask(@NonNull Context context) {
+            weakReference = new WeakReference<>((Activity) context);
         }
 
         @Override
@@ -376,10 +724,10 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
             Activity activity = getActivity();
             if (activity != null) {
                 // Create dialog
-                prog = new ProgressDialog(activity);
+                progressDialog = new ProgressDialog(activity);
-                prog.setCancelable(false);
+                progressDialog.setCancelable(false);
-                prog.setMessage(activity.getString(R.string.msg_wait));
+                progressDialog.setMessage(activity.getString(R.string.msg_wait));
-                prog.show();
+                progressDialog.show();
             }
         }
 
@@ -392,10 +740,10 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
 
-            if (prog != null) {
+            if (progressDialog != null) {
-                Utility.copyToClipboard(prog.getContext(), result);
+                Utility.copyToClipboard(progressDialog.getContext(), result);
                 if (getActivity() != null) {
-                    prog.dismiss();
+                    progressDialog.dismiss();
                 }
             }
         }
@@ -411,4 +759,5 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
             }
         }
     }
+
 }

app/src/main/java/us/shandian/giga/ui/common/Deleter.java

@@ -0,0 +1,177 @@
+package us.shandian.giga.ui.common;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.design.widget.Snackbar;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+import us.shandian.giga.service.DownloadManager;
+import us.shandian.giga.service.DownloadManager.MissionIterator;
+import us.shandian.giga.ui.adapter.MissionAdapter;
+
+public class Deleter {
+    private static final int TIMEOUT = 5000;// ms
+    private static final int DELAY = 350;// ms
+    private static final int DELAY_RESUME = 400;// ms
+    private static final String BUNDLE_NAMES = "us.shandian.giga.ui.common.deleter.names";
+    private static final String BUNDLE_LOCATIONS = "us.shandian.giga.ui.common.deleter.locations";
+
+    private Snackbar snackbar;
+    private ArrayList<Mission> items;
+    private boolean running = true;
+
+    private Context mContext;
+    private MissionAdapter mAdapter;
+    private DownloadManager mDownloadManager;
+    private MissionIterator mIterator;
+    private Handler mHandler;
+    private View mView;
+
+    private final Runnable rShow;
+    private final Runnable rNext;
+    private final Runnable rCommit;
+
+    public Deleter(Bundle b, View v, Context c, MissionAdapter a, DownloadManager d, MissionIterator i, Handler h) {
+        mView = v;
+        mContext = c;
+        mAdapter = a;
+        mDownloadManager = d;
+        mIterator = i;
+        mHandler = h;
+
+        // use variables to know the reference of the lambdas
+        rShow = this::show;
+        rNext = this::next;
+        rCommit = this::commit;
+
+        items = new ArrayList<>(2);
+
+        if (b != null) {
+            String[] names = b.getStringArray(BUNDLE_NAMES);
+            String[] locations = b.getStringArray(BUNDLE_LOCATIONS);
+
+            if (names == null || locations == null) return;
+            if (names.length < 1 || locations.length < 1) return;
+            if (names.length != locations.length) return;
+
+            items.ensureCapacity(names.length);
+
+            for (int j = 0; j < locations.length; j++) {
+                Mission mission = mDownloadManager.getAnyMission(locations[j], names[j]);
+                if (mission == null) continue;
+
+                items.add(mission);
+                mIterator.hide(mission);
+            }
+
+            if (items.size() > 0) resume();
+        }
+    }
+
+    public void append(Mission item) {
+        mIterator.hide(item);
+        items.add(0, item);
+
+        show();
+    }
+
+    private void forget() {
+        mIterator.unHide(items.remove(0));
+        mAdapter.applyChanges();
+
+        show();
+    }
+
+    private void show() {
+        if (items.size() < 1) return;
+
+        pause();
+        running = true;
+
+        mHandler.postDelayed(rNext, DELAY);
+    }
+
+    private void next() {
+        if (items.size() < 1) return;
+
+        String msg = mContext.getString(R.string.file_deleted).concat(":\n").concat(items.get(0).name);
+
+        snackbar = Snackbar.make(mView, msg, Snackbar.LENGTH_INDEFINITE);
+        snackbar.setAction(R.string.undo, s -> forget());
+        snackbar.setActionTextColor(Color.YELLOW);
+        snackbar.show();
+
+        mHandler.postDelayed(rCommit, TIMEOUT);
+    }
+
+    private void commit() {
+        if (items.size() < 1) return;
+
+        while (items.size() > 0) {
+            Mission mission = items.remove(0);
+            if (mission.deleted) continue;
+
+            mIterator.unHide(mission);
+            mDownloadManager.deleteMission(mission);
+
+            if (mission instanceof FinishedMission) {
+                mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(mission.getDownloadedFile())));
+            }
+            break;
+        }
+
+        if (items.size() < 1) {
+            pause();
+            return;
+        }
+
+        show();
+    }
+
+    private void pause() {
+        running = false;
+        mHandler.removeCallbacks(rNext);
+        mHandler.removeCallbacks(rShow);
+        mHandler.removeCallbacks(rCommit);
+        if (snackbar != null) snackbar.dismiss();
+    }
+
+    public void resume() {
+        if (running) return;
+        mHandler.postDelayed(rShow, DELAY_RESUME);
+    }
+
+    public void dispose(Bundle bundle) {
+        if (items.size() < 1) return;
+
+        pause();
+
+        if (bundle == null) {
+            for (Mission mission : items) mDownloadManager.deleteMission(mission);
+            items = null;
+            return;
+        }
+
+        String[] names = new String[items.size()];
+        String[] locations = new String[items.size()];
+
+        for (int i = 0; i < items.size(); i++) {
+            Mission mission = items.get(i);
+            names[i] = mission.name;
+            locations[i] = mission.location;
+        }
+
+        bundle.putStringArray(BUNDLE_NAMES, names);
+        bundle.putStringArray(BUNDLE_LOCATIONS, locations);
+    }
+}

app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java

@@ -1,25 +1,36 @@
 package us.shandian.giga.ui.common;
 
-import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.PixelFormat;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorRes;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 
 public class ProgressDrawable extends Drawable {
-    private float mProgress;
+    private static final int MARQUEE_INTERVAL = 150;
-    private final int mBackgroundColor;
-    private final int mForegroundColor;
 
-    public ProgressDrawable(Context context, @ColorRes int background, @ColorRes int foreground) {
+    private float mProgress;
-        this(ContextCompat.getColor(context, background), ContextCompat.getColor(context, foreground));
+    private int mBackgroundColor, mForegroundColor;
+    private Handler mMarqueeHandler;
+    private float mMarqueeProgress;
+    private Path mMarqueeLine;
+    private int mMarqueeSize;
+    private long mMarqueeNext;
+
+    public ProgressDrawable() {
+        mMarqueeLine = null;// marquee disabled
+        mMarqueeProgress = 0f;
+        mMarqueeSize = 0;
+        mMarqueeNext = 0;
     }
 
-    public ProgressDrawable(int background, int foreground) {
+    public void setColors(@ColorInt int background, @ColorInt int foreground) {
         mBackgroundColor = background;
         mForegroundColor = foreground;
     }
@@ -29,10 +40,20 @@ public class ProgressDrawable extends Drawable {
         invalidateSelf();
     }
 
+    public void setMarquee(boolean marquee) {
+        if (marquee == (mMarqueeLine != null)) {
+            return;
+        }
+        mMarqueeLine = marquee ? new Path() : null;
+        mMarqueeHandler = marquee ? new Handler(Looper.getMainLooper()) : null;
+        mMarqueeSize = 0;
+        mMarqueeNext = 0;
+    }
+
     @Override
     public void draw(@NonNull Canvas canvas) {
-        int width = canvas.getWidth();
+        int width = getBounds().width();
-        int height = canvas.getHeight();
+        int height = getBounds().height();
 
         Paint paint = new Paint();
 
@@ -40,6 +61,42 @@ public class ProgressDrawable extends Drawable {
         canvas.drawRect(0, 0, width, height, paint);
 
         paint.setColor(mForegroundColor);
+
+        if (mMarqueeLine != null) {
+            if (mMarqueeSize < 1) setupMarquee(width, height);
+
+            int size = mMarqueeSize;
+            Paint paint2 = new Paint();
+            paint2.setColor(mForegroundColor);
+            paint2.setStrokeWidth(size);
+            paint2.setStyle(Paint.Style.STROKE);
+
+            size *= 2;
+
+            if (mMarqueeProgress >= size) {
+                mMarqueeProgress = 1;
+            } else {
+                mMarqueeProgress++;
+            }
+
+            // render marquee
+            width += size * 2;
+            Path marquee = new Path();
+            for (float i = -size; i < width; i += size) {
+                marquee.addPath(mMarqueeLine, i + mMarqueeProgress, 0);
+            }
+            marquee.close();
+
+            canvas.drawPath(marquee, paint2);// draw marquee
+
+            if (System.currentTimeMillis() >= mMarqueeNext) {
+                // program next update
+                mMarqueeNext = System.currentTimeMillis() + MARQUEE_INTERVAL;
+                mMarqueeHandler.postDelayed(this::invalidateSelf, MARQUEE_INTERVAL);
+            }
+            return;
+        }
+
         canvas.drawRect(0, 0, (int) (mProgress * width), height, paint);
     }
 
@@ -58,4 +115,17 @@ public class ProgressDrawable extends Drawable {
         return PixelFormat.OPAQUE;
     }
 
+    @Override
+    public void onBoundsChange(Rect rect) {
+        if (mMarqueeLine != null) setupMarquee(rect.width(), rect.height());
+    }
+
+    private void setupMarquee(int width, int height) {
+        mMarqueeSize = (int) ((width * 10f) / 100f);// the size is 10% of the width
+
+        mMarqueeLine.rewind();
+        mMarqueeLine.moveTo(-mMarqueeSize, -mMarqueeSize);
+        mMarqueeLine.lineTo(-mMarqueeSize * 4, height + mMarqueeSize);
+        mMarqueeLine.close();
+    }
 }

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

@@ -1,12 +0,0 @@
-package us.shandian.giga.ui.fragment;
-
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.service.DownloadManagerService;
-
-public class AllMissionsFragment extends MissionsFragment {
-
-    @Override
-    protected DownloadManager setupDownloadManager(DownloadManagerService.DMBinder binder) {
-        return binder.getDownloadManager();
-    }
-}

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

@@ -10,52 +10,59 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.download.DeleteDownloadManager;
+import org.schabi.newpipe.util.ThemeHelper;
 
-import io.reactivex.disposables.Disposable;
+import us.shandian.giga.service.DownloadManager;
-import us.shandian.giga.get.DownloadManager;
 import us.shandian.giga.service.DownloadManagerService;
+import us.shandian.giga.service.DownloadManagerService.DMBinder;
 import us.shandian.giga.ui.adapter.MissionAdapter;
 
-public abstract class MissionsFragment extends Fragment {
+public class MissionsFragment extends Fragment {
-    private DownloadManager mDownloadManager;
+
-    private DownloadManagerService.DMBinder mBinder;
+    private static final int SPAN_SIZE = 2;
 
     private SharedPreferences mPrefs;
     private boolean mLinear;
     private MenuItem mSwitch;
+    private MenuItem mClear = null;
 
     private RecyclerView mList;
+    private View mEmpty;
     private MissionAdapter mAdapter;
     private GridLayoutManager mGridManager;
     private LinearLayoutManager mLinearManager;
-    private Context mActivity;
+    private Context mContext;
-    private DeleteDownloadManager mDeleteDownloadManager;
-    private Disposable mDeleteDisposable;
 
-    private final ServiceConnection mConnection = new ServiceConnection() {
+    private DMBinder mBinder;
+    private Bundle mBundle;
+    private boolean mForceUpdate;
+
+    private ServiceConnection mConnection = new ServiceConnection() {
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
             mBinder = (DownloadManagerService.DMBinder) binder;
-            mDownloadManager = setupDownloadManager(mBinder);
+            mBinder.clearDownloadNotifications();
-            if (mDeleteDownloadManager != null) {
+
-                mDeleteDownloadManager.setDownloadManager(mDownloadManager);
+            mAdapter = new MissionAdapter(mContext, mBinder.getDownloadManager(), mClear, mEmpty);
-                updateList();
+            mAdapter.deleterLoad(mBundle, getView());
-            }
+
+            mBundle = null;
+
+            mBinder.addMissionEventListener(mAdapter.getMessenger());
+            mBinder.enableNotifications(false);
+
+            updateList();
         }
 
         @Override
@@ -66,14 +73,6 @@ public abstract class MissionsFragment extends Fragment {
 
     };
 
-    public void setDeleteManager(@NonNull DeleteDownloadManager deleteDownloadManager) {
-        mDeleteDownloadManager = deleteDownloadManager;
-        if (mDownloadManager != null) {
-            mDeleteDownloadManager.setDownloadManager(mDownloadManager);
-            updateList();
-        }
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.missions, container, false);
@@ -81,18 +80,31 @@ public abstract class MissionsFragment extends Fragment {
         mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
         mLinear = mPrefs.getBoolean("linear", false);
 
+        //mContext = getActivity().getApplicationContext();
+        mBundle = savedInstanceState;
+
         // Bind the service
-        Intent i = new Intent();
+        mContext.bindService(new Intent(mContext, DownloadManagerService.class), mConnection, Context.BIND_AUTO_CREATE);
-        i.setClass(getActivity(), DownloadManagerService.class);
-        getActivity().bindService(i, mConnection, Context.BIND_AUTO_CREATE);
 
         // Views
+        mEmpty = v.findViewById(R.id.list_empty_view);
         mList = v.findViewById(R.id.mission_recycler);
 
-        // Init
+        // Init layouts managers
-        mGridManager = new GridLayoutManager(getActivity(), 2);
+        mGridManager = new GridLayoutManager(getActivity(), SPAN_SIZE);
+        mGridManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                switch (mAdapter.getItemViewType(position)) {
+                    case DownloadManager.SPECIAL_PENDING:
+                    case DownloadManager.SPECIAL_FINISHED:
+                        return SPAN_SIZE;
+                    default:
+                        return 1;
+                }
+            }
+        });
         mLinearManager = new LinearLayoutManager(getActivity());
-        mList.setLayoutManager(mGridManager);
 
         setHasOptionsMenu(true);
 
@@ -103,13 +115,13 @@ public abstract class MissionsFragment extends Fragment {
      * Added in API level 23.
      */
     @Override
-    public void onAttach(Context activity) {
+    public void onAttach(Context context) {
-        super.onAttach(activity);
+        super.onAttach(context);
 
         // Bug: in api< 23 this is never called
         // so mActivity=null
-        // so app crashes with nullpointer exception
+        // so app crashes with null-pointer exception
-        mActivity = activity;
+        mContext = context;
     }
 
     /**
@@ -120,34 +132,29 @@ public abstract class MissionsFragment extends Fragment {
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
-        mActivity = activity;
+        mContext = activity.getApplicationContext();
     }
 
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (mDeleteDownloadManager != null) {
-            mDeleteDisposable = mDeleteDownloadManager.getUndoObservable().subscribe(mission -> {
-                if (mAdapter != null) {
-                    mAdapter.updateItemList();
-                    mAdapter.notifyDataSetChanged();
-                }
-            });
-        }
-    }
 
     @Override
-    public void onDestroyView() {
+    public void onDestroy() {
-        super.onDestroyView();
+        super.onDestroy();
-        getActivity().unbindService(mConnection);
+        if (mBinder == null || mAdapter == null) return;
-        if (mDeleteDisposable != null) {
+
-            mDeleteDisposable.dispose();
+        mBinder.removeMissionEventListener(mAdapter.getMessenger());
-        }
+        mBinder.enableNotifications(true);
+        mContext.unbindService(mConnection);
+        mAdapter.deleterDispose(null);
+
+        mBinder = null;
+        mAdapter = null;
     }
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         mSwitch = menu.findItem(R.id.switch_mode);
+        mClear = menu.findItem(R.id.clear_list);
+        if (mAdapter != null) mAdapter.setClearButton(mClear);
         super.onPrepareOptionsMenu(menu);
     }
 
@@ -155,35 +162,79 @@ public abstract class MissionsFragment extends Fragment {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.switch_mode:
-				mLinear = !mLinear;
+                mLinear = !mLinear;
-				updateList();
+                updateList();
-				return true;
+                return true;
-			default:
+            case R.id.clear_list:
-				return super.onOptionsItemSelected(item);
+                mAdapter.clearFinishedDownloads();
-		}
+                return true;
-    }
+            default:
-
+                return super.onOptionsItemSelected(item);
-    public void notifyChange() {
+        }
-        mAdapter.notifyDataSetChanged();
     }
 
     private void updateList() {
-        mAdapter = new MissionAdapter((Activity) mActivity, mBinder, mDownloadManager, mDeleteDownloadManager, mLinear);
-
         if (mLinear) {
             mList.setLayoutManager(mLinearManager);
         } else {
             mList.setLayoutManager(mGridManager);
         }
 
+        // destroy all created views in the recycler
+        mList.setAdapter(null);
+        mAdapter.notifyDataSetChanged();
+
+        // re-attach the adapter in grid/lineal mode
+        mAdapter.setLinear(mLinear);
         mList.setAdapter(mAdapter);
 
         if (mSwitch != null) {
-            mSwitch.setIcon(mLinear ? R.drawable.grid : R.drawable.list);
+            boolean isLight = ThemeHelper.isLightThemeSelected(mContext);
-        }
+            int icon;
 
-        mPrefs.edit().putBoolean("linear", mLinear).apply();
+            if (mLinear)
+                icon = isLight ? R.drawable.ic_list_black_24dp : R.drawable.ic_list_white_24dp;
+            else
+                icon = isLight ? R.drawable.ic_grid_black_24dp : R.drawable.ic_grid_white_24dp;
+
+            mSwitch.setIcon(icon);
+            mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
+            mPrefs.edit().putBoolean("linear", mLinear).apply();
+        }
     }
 
-    protected abstract DownloadManager setupDownloadManager(DownloadManagerService.DMBinder binder);
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (mAdapter != null) {
+            mAdapter.deleterDispose(outState);
+            mForceUpdate = true;
+            mBinder.removeMissionEventListener(mAdapter.getMessenger());
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mAdapter != null) {
+            mAdapter.deleterResume();
+
+            if (mForceUpdate) {
+                mForceUpdate = false;
+                mAdapter.forceUpdate();
+            }
+
+            mBinder.addMissionEventListener(mAdapter.getMessenger());
+        }
+        if (mBinder != null) mBinder.enableNotifications(false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mAdapter != null) mAdapter.onPaused();
+        if (mBinder != null) mBinder.enableNotifications(true);
+    }
 }

app/src/main/java/us/shandian/giga/util/Utility.java

@@ -3,15 +3,18 @@ package us.shandian.giga.util;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.annotation.ColorRes;
+import android.os.Build;
+import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 
 import java.io.BufferedOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -19,14 +22,17 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.net.HttpURLConnection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
 
 public class Utility {
 
     public enum FileType {
         VIDEO,
         MUSIC,
+        SUBTITLE,
         UNKNOWN
     }
 
@@ -34,11 +40,11 @@ public class Utility {
         if (bytes < 1024) {
             return String.format("%d B", bytes);
         } else if (bytes < 1024 * 1024) {
-            return String.format("%.2f kB", (float) bytes / 1024);
+            return String.format("%.2f kB", bytes / 1024d);
         } else if (bytes < 1024 * 1024 * 1024) {
-            return String.format("%.2f MB", (float) bytes / 1024 / 1024);
+            return String.format("%.2f MB", bytes / 1024d / 1024d);
         } else {
-            return String.format("%.2f GB", (float) bytes / 1024 / 1024 / 1024);
+            return String.format("%.2f GB", bytes / 1024d / 1024d / 1024d);
         }
     }
 
@@ -54,41 +60,32 @@ public class Utility {
         }
     }
 
-    public static void writeToFile(@NonNull String fileName, @NonNull Serializable serializable) {
+    public static void writeToFile(@NonNull File file, @NonNull Serializable serializable) {
-        ObjectOutputStream objectOutputStream = null;
 
-        try {
+        try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(file)))) {
-            objectOutputStream = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(fileName)));
             objectOutputStream.writeObject(serializable);
         } catch (Exception e) {
             //nothing to do
-        } finally {
-            if(objectOutputStream != null) {
-                try {
-                    objectOutputStream.close();
-                } catch (Exception e) {
-                    //nothing to do
-                }
-            }
         }
+        //nothing to do
     }
 
     @Nullable
     @SuppressWarnings("unchecked")
-    public static <T> T readFromFile(String file) {
+    public static <T> T readFromFile(File file) {
-        T object = null;
+        T object;
         ObjectInputStream objectInputStream = null;
 
         try {
             objectInputStream = new ObjectInputStream(new FileInputStream(file));
             object = (T) objectInputStream.readObject();
         } catch (Exception e) {
-            //nothing to do
+            object = null;
         }
 
-        if(objectInputStream != null){
+        if (objectInputStream != null) {
             try {
-                objectInputStream .close();
+                objectInputStream.close();
             } catch (Exception e) {
                 //nothing to do
             }
@@ -119,39 +116,68 @@ public class Utility {
         }
     }
 
-    public static FileType getFileType(String file) {
+    public static FileType getFileType(char kind, String file) {
-        if (file.endsWith(".mp3") || file.endsWith(".wav") || file.endsWith(".flac") || file.endsWith(".m4a")) {
+        switch (kind) {
+            case 'v':
+                return FileType.VIDEO;
+            case 'a':
+                return FileType.MUSIC;
+            case 's':
+                return FileType.SUBTITLE;
+            //default '?':
+        }
+
+        if (file.endsWith(".srt") || file.endsWith(".vtt") || file.endsWith(".ssa")) {
+            return FileType.SUBTITLE;
+        } else if (file.endsWith(".mp3") || file.endsWith(".wav") || file.endsWith(".flac") || file.endsWith(".m4a") || file.endsWith(".opus")) {
             return FileType.MUSIC;
         } else if (file.endsWith(".mp4") || file.endsWith(".mpeg") || file.endsWith(".rm") || file.endsWith(".rmvb")
                 || file.endsWith(".flv") || file.endsWith(".webp") || file.endsWith(".webm")) {
             return FileType.VIDEO;
-        } else {
-            return FileType.UNKNOWN;
         }
+
+        return FileType.UNKNOWN;
     }
 
-    @ColorRes
+    @ColorInt
-    public static int getBackgroundForFileType(FileType type) {
+    public static int getBackgroundForFileType(Context ctx, FileType type) {
+        int colorRes;
         switch (type) {
             case MUSIC:
-                return R.color.audio_left_to_load_color;
+                colorRes = R.color.audio_left_to_load_color;
+                break;
             case VIDEO:
-                return R.color.video_left_to_load_color;
+                colorRes = R.color.video_left_to_load_color;
+                break;
+            case SUBTITLE:
+                colorRes = R.color.subtitle_left_to_load_color;
+                break;
             default:
-                return R.color.gray;
+                colorRes = R.color.gray;
         }
+
+        return ContextCompat.getColor(ctx, colorRes);
     }
 
-    @ColorRes
+    @ColorInt
-    public static int getForegroundForFileType(FileType type) {
+    public static int getForegroundForFileType(Context ctx, FileType type) {
+        int colorRes;
         switch (type) {
             case MUSIC:
-                return R.color.audio_already_load_color;
+                colorRes = R.color.audio_already_load_color;
+                break;
             case VIDEO:
-                return R.color.video_already_load_color;
+                colorRes = R.color.video_already_load_color;
+                break;
+            case SUBTITLE:
+                colorRes = R.color.subtitle_already_load_color;
+                break;
             default:
-                return R.color.gray;
+                colorRes = R.color.gray;
+                break;
         }
+
+        return ContextCompat.getColor(ctx, colorRes);
     }
 
     @DrawableRes
@@ -161,6 +187,8 @@ public class Utility {
                 return R.drawable.music;
             case VIDEO:
                 return R.drawable.video;
+            case SUBTITLE:
+                return R.drawable.subtitle;
             default:
                 return R.drawable.video;
         }
@@ -168,12 +196,18 @@ public class Utility {
 
     public static void copyToClipboard(Context context, String str) {
         ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+
+        if (cm == null) {
+            Toast.makeText(context, R.string.permission_denied, Toast.LENGTH_LONG).show();
+            return;
+        }
+
         cm.setPrimaryClip(ClipData.newPlainText("text", str));
         Toast.makeText(context, R.string.msg_copied, Toast.LENGTH_SHORT).show();
     }
 
     public static String checksum(String path, String algorithm) {
-        MessageDigest md = null;
+        MessageDigest md;
 
         try {
             md = MessageDigest.getInstance(algorithm);
@@ -181,7 +215,7 @@ public class Utility {
             throw new RuntimeException(e);
         }
 
-        FileInputStream i = null;
+        FileInputStream i;
 
         try {
             i = new FileInputStream(path);
@@ -190,14 +224,14 @@ public class Utility {
         }
 
         byte[] buf = new byte[1024];
-        int len = 0;
+        int len;
 
         try {
             while ((len = i.read(buf)) != -1) {
                 md.update(buf, 0, len);
             }
-        } catch (IOException ignored) {
+        } catch (IOException e) {
-
+            // nothing to do
         }
 
         byte[] digest = md.digest();
@@ -211,4 +245,31 @@ public class Utility {
         return sb.toString();
 
     }
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    public static boolean mkdir(File path, boolean allDirs) {
+        if (path.exists()) return true;
+
+        if (allDirs)
+            path.mkdirs();
+        else
+            path.mkdir();
+
+        return path.exists();
+    }
+
+    public static long getContentLength(HttpURLConnection connection) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return connection.getContentLengthLong();
+        }
+
+        try {
+            long length = Long.parseLong(connection.getHeaderField("Content-Length"));
+            if (length >= 0) return length;
+        } catch (Exception err) {
+            // nothing to do
+        }
+
+        return -1;
+    }
 }