player error fixer: don't show ui on reload/restart

Author: yuliskov

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

@@ -381,6 +381,7 @@ private void processFormatInfo(MediaItemFormatInfo formatInfo) {
             bgImageUrl = getVideo().getBackgroundUrl();
 
             // 18+ video or the video is hidden/removed
+            player.showOverlay(true);
             scheduleNextVideoTimer(5_000);
 
             //if (formatInfo.isUnknownError()) { // the bot error or the video not available
@@ -414,6 +415,7 @@ private void processFormatInfo(MediaItemFormatInfo formatInfo) {
             player.showProgressBar(false);
             mSuggestionsController.loadSuggestions(getVideo());
             bgImageUrl = getVideo().getBackgroundUrl();
+            player.showOverlay(true);
             scheduleReloadVideoTimer(30 * 1_000);
         }
 
@@ -427,7 +429,6 @@ private void scheduleReloadVideoTimer(int delayMs) {
 
         if (getPlayer().isEngineInitialized()) {
             Log.d(TAG, "Reloading the video...");
-            getPlayer().showOverlay(true);
             Utils.postDelayed(mReloadVideo, delayMs);
         }
     }
@@ -439,23 +440,20 @@ private void scheduleNextVideoTimer(int delayMs) {
 
         if (getPlayer().isEngineInitialized()) {
             Log.d(TAG, "Starting the next video...");
-            getPlayer().showOverlay(true);
             Utils.postDelayed(mLoadNext, delayMs);
         }
     }
 
     private void scheduleRebootAppTimer(int delayMs) {
         if (getPlayer() != null) {
             Log.d(TAG, "Rebooting the app...");
-            getPlayer().showOverlay(true);
             Utils.postDelayed(mRebootApp, delayMs);
         }
     }
 
     private void scheduleRestartEngineTimer(int delayMs) {
         if (getPlayer() != null) {
             Log.d(TAG, "Restarting the engine...");
-            getPlayer().showOverlay(true);
             Utils.postDelayed(mRestartEngine, delayMs);
         }
     }
@@ -489,10 +487,12 @@ private void disposeActions() {
     }
 
     private void runFormatErrorAction(Throwable error) {
+        if (getPlayer() == null) {
+            return;
+        }
+
         if (isEmbedPlayer()) {
-            if (getPlayer() != null) {
-                getPlayer().finish();
-            }
+            getPlayer().finish();
             return;
         }
 

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/common/LeanbackActivity.java

@@ -11,7 +11,6 @@
 import com.liskovsoft.smartyoutubetv2.common.misc.MotherActivity;
 import com.liskovsoft.smartyoutubetv2.common.misc.PlayerKeyTranslator;
 import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
-import com.liskovsoft.smartyoutubetv2.common.prefs.RemoteControlData;
 import com.liskovsoft.smartyoutubetv2.common.utils.Utils;
 import com.liskovsoft.smartyoutubetv2.tv.ui.common.keyhandler.DoubleBackManager2;
 import com.liskovsoft.smartyoutubetv2.tv.ui.playback.PlaybackActivity;
@@ -134,10 +133,8 @@ public void finishReally() {
     }
 
     private void finishTheApp() {
-        Utils.properlyFinishTheApp(this);
+        getViewManager().addOnFinish(sOnFinish);
 
-        if (!RemoteControlData.instance(this).isConnectedBefore()) {
-            getViewManager().addOnFinish(sOnFinish);
-        }
+        Utils.properlyFinishTheApp(this);
     }
 }