Playback resume

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -31,6 +31,11 @@ public abstract class StreamHistoryDAO implements HistoryDAO<StreamHistoryEntity
     @Nullable
     public abstract StreamHistoryEntity getLatestEntry();
 
+    @Query("SELECT * FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID +
+            " = :streamId ORDER BY " + STREAM_ACCESS_DATE + " DESC LIMIT 1")
+    @Nullable
+    public abstract StreamHistoryEntity getLatestEntry(final long streamId);
+
     @Override
     @Query("SELECT * FROM " + STREAM_HISTORY_TABLE)
     public abstract Flowable<List<StreamHistoryEntity>> getAll();

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

@@ -38,6 +38,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -49,6 +50,8 @@
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -71,6 +74,7 @@
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
+import org.schabi.newpipe.player.BasePlayer;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -95,6 +99,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import icepick.State;
 import io.reactivex.Single;
@@ -134,8 +139,10 @@ public class VideoDetailFragment
 
     private StreamInfo currentInfo;
     private Disposable currentWorker;
+
     @NonNull
     private CompositeDisposable disposables = new CompositeDisposable();
+    private HistoryRecordManager recordManager;
 
     private List<VideoStream> sortedVideoStreams;
     private int selectedVideoStreamIndex = -1;
@@ -153,6 +160,7 @@ public class VideoDetailFragment
     private View thumbnailBackgroundButton;
     private ImageView thumbnailImageView;
     private ImageView thumbnailPlayButton;
+    private ProgressBar positionView;
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
@@ -165,6 +173,7 @@ public class VideoDetailFragment
     private TextView detailControlsDownload;
     private TextView appendControlsDetail;
     private TextView detailDurationView;
+    private TextView detailPositionView;
 
     private LinearLayout videoDescriptionRootLayout;
     private TextView videoUploadDateView;
@@ -259,6 +268,8 @@ public void onResume() {
         // Check if it was loading when the fragment was stopped/paused,
         if (wasLoading.getAndSet(false)) {
             selectAndLoadVideo(serviceId, url, name);
+        } else if (currentInfo != null) {
+            updatePositionInfo(currentInfo);
         }
     }
 
@@ -289,10 +300,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             case ReCaptchaActivity.RECAPTCHA_REQUEST:
                 if (resultCode == Activity.RESULT_OK) {
                     NavigationHelper.openVideoDetailFragment(getFragmentManager(), serviceId, url, name);
-                } else Log.e(TAG, "ReCaptcha failed");
+                } else if (DEBUG) Log.e(TAG, "ReCaptcha failed");
                 break;
             default:
-                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                if (DEBUG) Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
                 break;
         }
     }
@@ -385,7 +396,7 @@ public void onClick(View v) {
                 break;
             case R.id.detail_uploader_root_layout:
                 if (TextUtils.isEmpty(currentInfo.getUploaderUrl())) {
-                    Log.w(TAG, "Can't open channel because we got no channel URL");
+                    if (DEBUG) Log.w(TAG, "Can't open channel because we got no channel URL");
                 } else {
                     try {
                     NavigationHelper.openChannelFragment(
@@ -455,6 +466,7 @@ protected void initViews(View rootView, Bundle savedInstanceState) {
         thumbnailBackgroundButton = rootView.findViewById(R.id.detail_thumbnail_root_layout);
         thumbnailImageView = rootView.findViewById(R.id.detail_thumbnail_image_view);
         thumbnailPlayButton = rootView.findViewById(R.id.detail_thumbnail_play_button);
+        positionView = rootView.findViewById(R.id.position_view);
 
         contentRootLayoutHiding = rootView.findViewById(R.id.detail_content_root_hiding);
 
@@ -469,6 +481,7 @@ protected void initViews(View rootView, Bundle savedInstanceState) {
         detailControlsDownload = rootView.findViewById(R.id.detail_controls_download);
         appendControlsDetail = rootView.findViewById(R.id.touch_append_detail);
         detailDurationView = rootView.findViewById(R.id.detail_duration_view);
+        detailPositionView = rootView.findViewById(R.id.detail_position_view);
 
         videoDescriptionRootLayout = rootView.findViewById(R.id.detail_description_root_layout);
         videoUploadDateView = rootView.findViewById(R.id.detail_upload_date_view);
@@ -672,8 +685,10 @@ private static void showInstallKoreDialog(final Context context) {
     }
 
     private void setupActionBarOnError(final String url) {
-        if (DEBUG) Log.d(TAG, "setupActionBarHandlerOnError() called with: url = [" + url + "]");
-        Log.e("-----", "missing code");
+        if (DEBUG) {
+            Log.d(TAG, "setupActionBarHandlerOnError() called with: url = [" + url + "]");
+            Log.e("-----", "missing code");
+        }
     }
 
     private void setupActionBar(final StreamInfo info) {
@@ -724,10 +739,10 @@ public void pushToStack(int serviceId, String videoUrl, String name) {
         if (stack.size() > 0
                 && stack.peek().getServiceId() == serviceId
                 && stack.peek().getUrl().equals(videoUrl)) {
-            Log.d(TAG, "pushToStack() called with: serviceId == peek.serviceId = ["
+            if (DEBUG) Log.d(TAG, "pushToStack() called with: serviceId == peek.serviceId = ["
                     + serviceId + "], videoUrl == peek.getUrl = [" + videoUrl + "]");
             return;
-        } else {
+        } else if (DEBUG) {
             Log.d(TAG, "pushToStack() wasn't equal");
         }
 
@@ -944,11 +959,15 @@ private void startOnExternalPlayer(@NonNull final Context context,
         NavigationHelper.playOnExternalPlayer(context, currentInfo.getName(),
                 currentInfo.getUploaderName(), selectedStream);
 
-        final HistoryRecordManager recordManager = new HistoryRecordManager(requireContext());
+        if (recordManager == null) {
+            recordManager = new HistoryRecordManager(requireContext());
+        }
         disposables.add(recordManager.onViewed(info).onErrorComplete()
                 .subscribe(
                         ignored -> {/* successful */},
-                        error -> Log.e(TAG, "Register view failure: ", error)
+                        error -> {
+                            if (DEBUG) Log.e(TAG, "Register view failure: ", error);
+                        }
                 ));
     }
 
@@ -1032,6 +1051,8 @@ public void showLoading() {
         animateView(spinnerToolbar, false, 200);
         animateView(thumbnailPlayButton, false, 50);
         animateView(detailDurationView, false, 100);
+        animateView(detailPositionView, false, 100);
+        animateView(positionView, false, 50);
 
         videoTitleTextView.setText(name != null ? name : "");
         videoTitleTextView.setMaxLines(1);
@@ -1146,6 +1167,7 @@ public void handleResult(@NonNull StreamInfo info) {
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }
         prepareDescription(info.getDescription());
+        updatePositionInfo(info);
 
         animateView(spinnerToolbar, true, 500);
         setupActionBar(info);
@@ -1250,4 +1272,46 @@ public void onBlockedByGemaError() {
 
         showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
     }
+
+    private void updatePositionInfo(final StreamInfo info) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+        final boolean playbackResumeEnabled =
+                prefs.getBoolean(activity.getString(R.string.enable_watch_history_key), true)
+                && prefs.getBoolean(activity.getString(R.string.enable_playback_resume_key), true);
+        if (!playbackResumeEnabled || info.getDuration() <= 0) {
+            positionView.setVisibility(View.INVISIBLE);
+            detailPositionView.setVisibility(View.GONE);
+            return;
+        }
+        if (recordManager == null) {
+            recordManager = new HistoryRecordManager(requireContext());
+        }
+        disposables.add(recordManager.loadStreamState(info)
+                .onErrorComplete()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        state -> {
+                            final int seconds = (int) (state.getProgressTime() / 1000.f);
+                            if (seconds > BasePlayer.PLAYBACK_SAVE_THRESHOLD_START_SECONDS &&
+                                    seconds < info.getDuration() - BasePlayer.PLAYBACK_SAVE_THRESHOLD_END_SECONDS) {
+                                positionView.setMax((int) info.getDuration());
+                                positionView.setProgress(seconds);
+                                detailPositionView.setText(Localization.getDurationString(seconds));
+                                animateView(positionView, true, 500);
+                                animateView(detailPositionView, true, 500);
+                            } else {
+                                animateView(positionView, false, 500);
+                                animateView(detailPositionView, false, 500);
+                            }
+                        },
+                        error -> {
+                            if (DEBUG) Log.e(TAG, "Player resume failure: ", error);
+                        },
+                        () -> {
+                            animateView(positionView, false, 500);
+                            animateView(detailPositionView, false, 500);
+                        }
+                ));
+    }
 }

app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java

@@ -107,6 +107,13 @@ public Flowable<List<StreamHistoryEntry>> getStreamHistory() {
         return streamHistoryTable.getHistory().subscribeOn(Schedulers.io());
     }
 
+    public Maybe<StreamHistoryEntity> getStreamHistory(final StreamInfo info) {
+        return Maybe.fromCallable(() -> {
+            final long streamId = streamTable.upsert(new StreamEntity(info));
+            return streamHistoryTable.getLatestEntry(streamId);
+        }).subscribeOn(Schedulers.io());
+    }
+
     public Flowable<List<StreamStatisticsEntry>> getStreamStatistics() {
         return streamHistoryTable.getStatistics().subscribeOn(Schedulers.io());
     }
@@ -195,6 +202,13 @@ public Maybe<Long> saveStreamState(@NonNull final StreamInfo info, final long pr
         })).subscribeOn(Schedulers.io());
     }
 
+    public Maybe<Integer> resetStreamState(@NonNull final StreamInfo info) {
+        return Maybe.fromCallable(() -> database.runInTransaction(() -> {
+            final long streamId = streamTable.upsert(new StreamEntity(info));
+            return streamStateTable.deleteState(streamId);
+        })).subscribeOn(Schedulers.io());
+    }
+
     ///////////////////////////////////////////////////////
     // Utility
     ///////////////////////////////////////////////////////

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

@@ -150,6 +150,7 @@ private void onClose() {
             lockManager.releaseWifiAndCpu();
         }
         if (basePlayerImpl != null) {
+            basePlayerImpl.savePlaybackState();
             basePlayerImpl.stopActivityBinding();
             basePlayerImpl.destroy();
         }