From 9e6ebcc23f5d3b7e202e180666dfaa23d46a252b Mon Sep 17 00:00:00 2001
From: Yuriy Liskov <firsthash@gmail.com>
Date: Thu, 22 May 2025 11:17:10 +0300
Subject: [PATCH] remote fix with the preview

---
 .../playback/controllers/PlayerUIController.java     |  4 ++++
 .../playback/controllers/RemoteController.java       | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/PlayerUIController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/PlayerUIController.java
index 65885d20f..afeeabf2a 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/PlayerUIController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/PlayerUIController.java
@@ -272,6 +272,10 @@ public class PlayerUIController extends BasePlayerController {
 
     @Override
     public void onSeekEnd() {
+        if (getPlayer() == null) {
+            return;
+        }
+
         getPlayer().updateEndingTime();
     }
 
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/RemoteController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/RemoteController.java
index a635e4a5c..d2a8a9f93 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/RemoteController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/RemoteController.java
@@ -129,7 +129,7 @@ public class RemoteController extends BasePlayerController implements OnDataChan
     }
 
     private void postStartPlaying(@Nullable Video item, boolean isPlaying) {
-        if (!mRemoteControlData.isDeviceLinkEnabled() || !isConnectedBefore()) {
+        if (isRemoteDisabled()) {
             return;
         }
 
@@ -147,7 +147,7 @@ public class RemoteController extends BasePlayerController implements OnDataChan
     }
 
     private void postStartPlaying(String videoId, long positionMs, long durationMs, boolean isPlaying) {
-        if (!mRemoteControlData.isDeviceLinkEnabled() || !isConnectedBefore()) {
+        if (isRemoteDisabled()) {
             return;
         }
 
@@ -159,7 +159,7 @@ public class RemoteController extends BasePlayerController implements OnDataChan
     }
 
     private void postState(long positionMs, long durationMs, boolean isPlaying) {
-        if (!mRemoteControlData.isDeviceLinkEnabled() || !isConnectedBefore()) {
+        if (isRemoteDisabled()) {
             return;
         }
 
@@ -171,7 +171,7 @@ public class RemoteController extends BasePlayerController implements OnDataChan
     }
 
     private void postVolumeChange(int volume) {
-        if (!mRemoteControlData.isDeviceLinkEnabled() || !isConnectedBefore()) {
+        if (isRemoteDisabled()) {
             return;
         }
 
@@ -538,4 +538,8 @@ public class RemoteController extends BasePlayerController implements OnDataChan
     private boolean isConnectedBefore() {
         return mConnected || mRemoteControlData.isConnectedBefore();
     }
+
+    private boolean isRemoteDisabled() {
+        return !mRemoteControlData.isDeviceLinkEnabled() || !isConnectedBefore() || isEmbedPlayer();
+    }
 }