1 files changed, 5 insertions, 12 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 1c8619e99..15d0bec4a 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -17,7 +17,6 @@ import android.widget.ImageView;
 
 import androidx.core.view.WindowCompat;
 import androidx.appcompat.app.ActionBar;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
@@ -37,12 +36,12 @@ import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.ui.appstartintent.MainActivityStarter;
 import de.danoeh.antennapod.view.AspectRatioVideoView;
 
 /**
@@ -88,9 +87,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
-            playExternalMedia(getIntent(), MediaType.VIDEO);
-        } else if (PlaybackService.isCasting()) {
+        if (PlaybackService.isCasting()) {
             Intent intent = PlaybackService.getPlayerActivityIntent(this);
             if (!intent.getComponent().getClassName().equals(VideoplayerActivity.class.getName())) {
                 destroyingDueToReload = true;
@@ -135,17 +132,13 @@ public class VideoplayerActivity extends MediaplayerActivity {
     }
 
     @Override
-    protected boolean loadMediaInfo() {
-        if (!super.loadMediaInfo() || controller == null) {
-            return false;
-        }
+    protected void loadMediaInfo() {
+        super.loadMediaInfo();
         Playable media = controller.getMedia();
         if (media != null) {
             getSupportActionBar().setSubtitle(media.getEpisodeTitle());
             getSupportActionBar().setTitle(media.getFeedTitle());
-            return true;
         }
-        return false;
     }
 
     @Override
@@ -347,7 +340,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             Log.d(TAG, "ReloadNotification received, switching to Castplayer now");
             destroyingDueToReload = true;
             finish();
-            startActivity(new Intent(this, MainActivity.class).putExtra(MainActivity.EXTRA_OPEN_PLAYER, true));
+            new MainActivityStarter(this).withOpenPlayer().start();
         }
     }