CrashRestore: fix position reset

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/Video.java

@@ -86,6 +86,7 @@ public final class Video {
     public long startTimeMs;
     public long pendingPosMs;
     public boolean fromQueue;
+    public boolean fromCrashRestorer;
     public boolean isPending;
     public boolean finishOnEnded;
     public boolean incognito;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java

@@ -334,6 +334,11 @@ private void resetPositionIfNeeded(Video item) {
             return;
         }
 
+        if (item.fromCrashRestorer) {
+            item.fromCrashRestorer = false;
+            return;
+        }
+
         State state = getStateService().getByVideoId(item.videoId);
 
         // Reset position of music videos

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/CrashRestorer.java

@@ -61,7 +61,7 @@ public void restorePlayback() {
             VideoStateService stateService = VideoStateService.instance(mContext);
             boolean isVideoStateSynced = mSelectedVideo == null || stateService.getByVideoId(mSelectedVideo.videoId) != null;
             State lastState = stateService.getLastState();
-            PlaybackPresenter.instance(mContext).openVideo(lastState != null && isVideoStateSynced ? lastState.video : mSelectedVideo);
+            openVideo(lastState != null && isVideoStateSynced ? lastState.video : mSelectedVideo);
         }
 
         // Restore can be called only once
@@ -76,4 +76,12 @@ public void restoreHeader(OnRestoreHeader onRestoreHeader) {
         // Restore can be called only once
         mSelectedHeaderIndex = -1;
     }
+
+    private void openVideo(Video video) {
+        if (video != null) {
+            video.fromCrashRestorer = true; // tell the state controller to not reset the position
+        }
+
+        PlaybackPresenter.instance(mContext).openVideo(video);
+    }
 }