[Feature Added] Restart Song From Start

app/build.gradle

@@ -57,7 +57,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.teamnewpipe:NewPipeExtractor:06f2144e4daa10'
+    implementation 'com.github.timfbfbfbfb:NewPipeExtractor:5a51a7f8fc0a62e1374d1ddd08a250e6c05bd840'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 

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

@@ -436,7 +436,7 @@ private void openDownloadDialog() {
                             sortedVideoStreams);
 
                     FragmentManager fm = getSupportFragmentManager();
-                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(result, null);
                     downloadDialog.setVideoStreams(sortedVideoStreams);
                     downloadDialog.setAudioStreams(result.getAudioStreams());
                     downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.database.playlist.model;
 
+import android.text.TextUtils;
+
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.Ignore;
@@ -72,10 +74,16 @@ public PlaylistRemoteEntity(final PlaylistInfo info) {
 
     @Ignore
     public boolean isIdenticalTo(final PlaylistInfo info) {
-        return getServiceId() == info.getServiceId() && getName().equals(info.getName()) &&
-                getStreamCount() == info.getStreamCount() && getUrl().equals(info.getUrl()) &&
-                getThumbnailUrl().equals(info.getThumbnailUrl()) &&
-                getUploader().equals(info.getUploaderName());
+        /*
+         * Returns boolean comparing the online playlist and the local copy.
+         * (False if info changed such as playlist name or track count)
+         */
+        return getServiceId() == info.getServiceId()
+                && getStreamCount() == info.getStreamCount()
+                && TextUtils.equals(getName(), info.getName())
+                && TextUtils.equals(getUrl(), info.getUrl())
+                && TextUtils.equals(getThumbnailUrl(), info.getThumbnailUrl())
+                && TextUtils.equals(getUploader(), info.getUploaderName());
     }
 
     public long getUid() {

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

@@ -23,9 +23,11 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -46,6 +48,7 @@
 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.fragments.list.playlist.PlaylistFragment;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.settings.NewPipeSettings;
@@ -76,7 +79,8 @@
 import us.shandian.giga.service.DownloadManagerService.DownloadManagerBinder;
 import us.shandian.giga.service.MissionState;
 
-public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
+public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener,
+        AdapterView.OnItemSelectedListener {
     private static final String TAG = "DialogFragment";
     private static final boolean DEBUG = MainActivity.DEBUG;
     private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230;
@@ -107,21 +111,27 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private RadioGroup radioStreamsGroup;
     private TextView threadsCountTextView;
     private SeekBar threadsSeekBar;
+    private CheckBox smartDownloadCheckbox;
+    private DownloadSetting downloadSetting;
+
+    @Nullable
+    private PlaylistFragment.PlaylistDownloadCallback playlistDownloadCallback;
 
     private SharedPreferences prefs;
 
-    public static DownloadDialog newInstance(StreamInfo info) {
+    public static DownloadDialog newInstance(StreamInfo info, @Nullable PlaylistFragment.PlaylistDownloadCallback callback) {
         DownloadDialog dialog = new DownloadDialog();
         dialog.setInfo(info);
+        dialog.setPlaylistCallback(callback);
         return dialog;
     }
 
-    public static DownloadDialog newInstance(Context context, StreamInfo info) {
+    public static DownloadDialog newInstance(Context context, StreamInfo info, @Nullable PlaylistFragment.PlaylistDownloadCallback callback) {
         final ArrayList<VideoStream> streamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context,
                 info.getVideoStreams(), info.getVideoOnlyStreams(), false));
         final int selectedStreamIndex = ListHelper.getDefaultResolutionIndex(context, streamsList);
 
-        final DownloadDialog instance = newInstance(info);
+        final DownloadDialog instance = newInstance(info, callback);
         instance.setVideoStreams(streamsList);
         instance.setSelectedVideoStream(selectedStreamIndex);
         instance.setAudioStreams(info.getAudioStreams());
@@ -162,6 +172,10 @@ public void setSelectedVideoStream(int selectedVideoIndex) {
         this.selectedVideoIndex = selectedVideoIndex;
     }
 
+    public void setPlaylistCallback(PlaylistFragment.PlaylistDownloadCallback callback) {
+        this.playlistDownloadCallback = callback;
+    }
+
     public void setSelectedAudioStream(int selectedAudioIndex) {
         this.selectedAudioIndex = selectedAudioIndex;
     }
@@ -258,6 +272,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         radioStreamsGroup = view.findViewById(R.id.video_audio_group);
         radioStreamsGroup.setOnCheckedChangeListener(this);
 
+        smartDownloadCheckbox = view.findViewById(R.id.dialog_download_checkbox_intelligent);
+        if (playlistDownloadCallback != null)
+            smartDownloadCheckbox.setVisibility(View.VISIBLE);
+
         initToolbar(view.findViewById(R.id.toolbar));
         setupDownloadOptions();
 
@@ -364,12 +382,29 @@ private void initToolbar(Toolbar toolbar) {
         okButton = toolbar.findViewById(R.id.okay);
         okButton.setEnabled(false);// disable until the download service connection is done
 
+        if (playlistDownloadCallback != null) {
+            toolbar.setTitle(getResources().getString(R.string.download) + " (" +
+                    getResources().getString(R.string.playlist) + ")");
+            MenuItem menuItem = toolbar.getMenu().findItem(R.id.skip);
+            menuItem.setVisible(true);
+        } else {
+            toolbar.setTitle(R.string.download_dialog_title);
+        }
+
         toolbar.setOnMenuItemClickListener(item -> {
+
             if (item.getItemId() == R.id.okay) {
                 prepareSelectedDownload();
-                return true;
+
+            } else if (item.getItemId() == R.id.skip) {
+                if (playlistDownloadCallback != null) {
+
+                    playlistDownloadCallback.accept(null);
+                }
             }
-            return false;
+
+            getDialog().dismiss();
+            return true;
         });
     }
 
@@ -780,20 +815,27 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
         String[] psArgs = null;
         String secondaryStreamUrl = null;
         long nearLength = 0;
+        String videoResolution = null;
+        int audioBitrate = -1;
+        Locale subtitleLocale = null;
 
         // more download logic: select muxer, subtitle converter, etc.
         switch (radioStreamsGroup.getCheckedRadioButtonId()) {
             case R.id.audio_button:
                 kind = 'a';
-                selectedStream = audioStreamsAdapter.getItem(selectedAudioIndex);
+                AudioStream audioStream = audioStreamsAdapter.getItem(selectedAudioIndex);
+                audioBitrate = audioStream.getAverageBitrate();
+                selectedStream = audioStream;
 
                 if (selectedStream.getFormat() == MediaFormat.M4A) {
                     psName = Postprocessing.ALGORITHM_M4A_NO_DASH;
                 }
                 break;
             case R.id.video_button:
                 kind = 'v';
-                selectedStream = videoStreamsAdapter.getItem(selectedVideoIndex);
+                VideoStream videoStream = videoStreamsAdapter.getItem(selectedVideoIndex);
+                videoResolution = videoStream.getResolution();
+                selectedStream = videoStream;
 
                 SecondaryStreamHelper<AudioStream> secondaryStream = videoStreamsAdapter
                         .getAllSecondary()
@@ -820,7 +862,9 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
             case R.id.subtitle_button:
                 threads = 1;// use unique thread for subtitles due small file size
                 kind = 's';
-                selectedStream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+                SubtitlesStream subtitlesStream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+                subtitleLocale = subtitlesStream.getLocale();
+                selectedStream = subtitlesStream;
 
                 if (selectedStream.getFormat() == MediaFormat.TTML) {
                     psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
@@ -840,8 +884,17 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) {
         } else {
             urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
         }
+        this.downloadSetting = new DownloadSetting(storage, threads, urls, currentInfo.getUrl(), kind, psName, psArgs,
+                nearLength, videoResolution, audioBitrate, subtitleLocale);
+        DownloadManagerService.startMission(context, downloadSetting);
 
-        DownloadManagerService.startMission(context, urls, storage, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
+        if (playlistDownloadCallback != null) {
+            if (smartDownloadCheckbox.isChecked() && downloadSetting != null) {
+                playlistDownloadCallback.accept(downloadSetting);
+            } else {
+                playlistDownloadCallback.accept(null);
+            }
+        }
 
         dismiss();
     }

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

@@ -0,0 +1,80 @@
+package org.schabi.newpipe.download;
+
+import java.util.Locale;
+
+import us.shandian.giga.io.StoredFileHelper;
+
+public class DownloadSetting {
+
+    private StoredFileHelper storedFileHelper;
+    private int threadCount;
+    private String[] urls;
+    private char kind;
+    private String psName;
+    private String[] psArgs;
+    private Long nearLength;
+    private String source;
+    private String videoResolution;
+    private int audioBitRate;
+    private Locale subtitleLocale;
+
+    public DownloadSetting(StoredFileHelper storedFileHelper, int threadCount, String[] urls,
+                           String source, char kind, String psName, String[] psArgs, Long nearLength,
+                           String videoResolution, int audioBitRate, Locale subtitleLocale) {
+        this.storedFileHelper = storedFileHelper;
+        this.threadCount = threadCount;
+        this.urls = urls;
+        this.kind = kind;
+        this.psName = psName;
+        this.psArgs = psArgs;
+        this.nearLength = nearLength;
+        this.source = source;
+        this.videoResolution = videoResolution;
+        this.audioBitRate = audioBitRate;
+        this.subtitleLocale = subtitleLocale;
+    }
+
+    public StoredFileHelper getStoredFileHelper() {
+        return storedFileHelper;
+    }
+
+    public int getThreadCount() {
+        return threadCount;
+    }
+
+    public String[] getUrls() {
+        return urls;
+    }
+
+    public char getKind() {
+        return this.kind;
+    }
+
+    public String getPsName() {
+        return this.psName;
+    }
+
+    public String[] getPsArgs() {
+        return this.psArgs;
+    }
+
+    public Long getNearLength() {
+        return this.nearLength;
+    }
+
+    public String getSource() {
+        return this.source;
+    }
+
+    public String getVideoResolution() {
+        return this.videoResolution;
+    }
+
+    public int getAudioBitRate() {
+        return this.audioBitRate;
+    }
+
+    public Locale getSubtitleLocale() {
+        return this.subtitleLocale;
+    }
+}

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

@@ -1168,7 +1168,7 @@ public void handleResult(@NonNull StreamInfo info) {
 
     public void openDownloadDialog() {
             try {
-                DownloadDialog downloadDialog = DownloadDialog.newInstance(currentInfo);
+                DownloadDialog downloadDialog = DownloadDialog.newInstance(currentInfo, null);
                 downloadDialog.setVideoStreams(sortedVideoStreams);
                 downloadDialog.setAudioStreams(currentInfo.getAudioStreams());
                 downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);