[pull] master from yuliskov:master

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

@@ -396,8 +396,4 @@ protected PlaybackPresenter getPlaybackPresenter() {
     protected boolean isEmbedPlayer() {
         return getPlayer() != null && getPlayer().isEmbed();
     }
-
-    protected boolean isSwitchFromEmbed() {
-        return mMainController != null && mMainController.isSwitchFromEmbed();
-    }
 }

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

@@ -207,7 +207,7 @@ private void disposeActions() {
     }
 
     private void skipSegment(long interval) {
-        if (mActiveSegments == null || mActiveSegments.isEmpty() || !Helpers.equals(mVideoId, getVideo())) {
+        if (mActiveSegments == null || mActiveSegments.isEmpty() || getVideo() == null || !Helpers.equals(mVideoId, getVideo().videoId)) {
             disposeActions();
             return;
         }

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

@@ -147,7 +147,7 @@ public void onEngineInitialized() {
             return;
         }
 
-        loadVideo(Helpers.firstNonNull(mPendingVideo, getPlayer().getVideo(), getVideo()));
+        loadVideo(Helpers.firstNonNull(mPendingVideo, getVideo()));
         getPlayer().setButtonState(R.id.action_repeat, getPlayerData().getPlaybackMode());
         mSleepTimerStartMs = System.currentTimeMillis();
         mPendingVideo = null;

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

@@ -64,9 +64,11 @@ public void onNewVideo(Video item) {
 
         enableIncognitoIfNeeded(item);
 
-        // Don't do reset on videoLoaded state because this will influences minimized music videos.
-        resetPositionIfNeeded(item);
-        resetGlobalSpeedIfNeeded();
+        if (!item.equals(getVideo())) { // skip switch from the embed to the fullscreen one
+            // Don't do reset on videoLoaded state because this will influences minimized music videos.
+            resetPositionIfNeeded(item);
+            resetGlobalSpeedIfNeeded();
+        }
     }
 
     @Override
@@ -130,12 +132,8 @@ public void onEngineReleased() {
         // Save previous state
         if (getPlayer().containsMedia()) {
             setPlayEnabled(getPlayer().getPlayWhenReady());
-            if (isSwitchFromEmbed()) {
-                savePosition();
-            } else {
-                saveState();
-                persistState();
-            }
+            saveState();
+            persistState();
         }
     }
 
@@ -322,7 +320,7 @@ private void resetPositionIfNeeded(Video item) {
 
         // Reset position of music videos
         boolean isShort = state != null && state.durationMs < MUSIC_VIDEO_MAX_DURATION_MS
-                && !getPlayerTweaksData().isRememberPositionOfShortVideosEnabled() && !isSwitchFromEmbed();
+                && !getPlayerTweaksData().isRememberPositionOfShortVideosEnabled();
         boolean isVideoEnded = state != null && state.durationMs - state.positionMs < 3_000;
         boolean isLive = item.isLive;
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/PlaybackPresenter.java

@@ -47,7 +47,6 @@ public boolean add(PlayerEventListener listener) {
     };
     private WeakReference<Video> mVideo;
     private Video mPendingVideo;
-    private boolean mIsSwitchFromEmbed;
     // Fix for using destroyed view
     private WeakReference<PlaybackView> mPlayer = new WeakReference<>(null);
 
@@ -124,10 +123,10 @@ public void openVideo(Video video) {
         if (getView() == null) {
             mPendingVideo = video;
         } else if (getView().isEmbed()) { // switching from the embed player to the fullscreen one
-            mIsSwitchFromEmbed = true;
             // The embed player doesn't disposed properly
             // NOTE: don't release after init check because this depends on timings
-            onEngineReleased();
+            //onEngineReleased();
+            getController(VideoStateController.class).savePosition();
             setView(null);
             onNewVideo(video);
         } else {
@@ -141,10 +140,6 @@ public Video getVideo() {
         return mVideo != null ? mVideo.get() : null;
     }
 
-    public boolean isSwitchFromEmbed() {
-        return mIsSwitchFromEmbed;
-    }
-
     public boolean isRunningInBackground() {
         return getView() != null &&
                 getView().isEngineBlocked() &&
@@ -309,8 +304,6 @@ public void onEngineInitialized() {
         getTickleManager().addListener(this);
 
         process(PlayerEventListener::onEngineInitialized);
-
-        mIsSwitchFromEmbed = false;
     }
 
     @Override

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/search/tags/SearchTagsFragment.java

@@ -365,7 +365,8 @@ private int findPositionById(int id) {
                 Object row = getResultsAdapter().get(i);
 
                 if (row instanceof ListRow) {
-                    VideoGroupObjectAdapter adapter = (VideoGroupObjectAdapter) ((ListRow) row).getAdapter();
+                    // Could be one of those: TagAdapter, VideoGroupObjectAdapter
+                    ObjectAdapter adapter = ((ListRow) row).getAdapter();
                     if (adapter == needed) {
                         return i;
                     }