RemoteControl: subtitles briefly enabled on start fix

Author: yuliskov

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

@@ -9,6 +9,7 @@
 import com.liskovsoft.mediaserviceinterfaces.ServiceManager;
 import com.liskovsoft.mediaserviceinterfaces.RemoteControlService;
 import com.liskovsoft.mediaserviceinterfaces.data.Command;
+import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.sharedutils.rx.RxHelper;
@@ -302,10 +303,13 @@ private void processCommand(Command command) {
                     getPlayer().showOverlay(false);
                 }
                 movePlayerToForeground();
-                Video newVideo2 = Video.from(command.getVideoId());
-                newVideo2.remotePlaylistId = command.getPlaylistId();
-                newVideo2.playlistIndex = command.getPlaylistIndex();
-                newVideo2.isRemote = true;
+                Video subsVideo = Video.from(command.getVideoId());
+                if (Helpers.equals(getVideo(), subsVideo)) {
+                    subsVideo = getVideo();
+                }
+                subsVideo.remotePlaylistId = command.getPlaylistId();
+                subsVideo.playlistIndex = command.getPlaylistIndex();
+                subsVideo.isRemote = true;
                 mNewVideoPositionMs = command.getCurrentTimeMs();
 
                 String langCode = command.getSubLanguageCode();
@@ -334,7 +338,7 @@ private void processCommand(Command command) {
                     getPlayer().setButtonState(R.id.lb_control_closed_captioning, PlayerUI.BUTTON_OFF);
                     //getMainController().onButtonClicked(R.id.lb_control_closed_captioning, PlayerUI.BUTTON_ON);
                  }
-                 openNewVideo(newVideo2);
+                 openNewVideo(subsVideo);
                  break;
             case Command.TYPE_UPDATE_PLAYLIST:
                 if (getPlayer() != null && mConnected) {

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

@@ -150,7 +150,9 @@ public void onTickle() {
     @Override
     public void onMetadata(MediaItemMetadata metadata) {
         // Channel info should be loaded at this point
-        restoreSubtitleFormat();
+        if (getVideo() != null && !getVideo().isRemote) {
+            restoreSubtitleFormat();
+        }
 
         // Need to contain channel id
         restoreSpeedAndPositionIfNeeded();