1 files changed, 25 insertions, 0 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index bd8e43c4e..d64e19447 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -1,9 +1,11 @@
 package de.danoeh.antennapod.activity;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 
+import de.danoeh.antennapod.core.cast.CastManager;
 import de.danoeh.antennapod.core.feed.MediaType;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
@@ -15,6 +17,17 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
     public static final String TAG = "AudioPlayerActivity";
 
     @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (CastManager.getInstance().isConnected()) {
+            Intent intent = PlaybackService.getPlayerActivityIntent(this);
+            if (!intent.getComponent().getClassName().equals(AudioplayerActivity.class.getName())) {
+                startActivity(intent);
+            }
+        }
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         if (TextUtils.equals(getIntent().getAction(), Intent.ACTION_VIEW)) {
@@ -32,4 +45,16 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             startService(launchIntent);
         }
     }
+
+    @Override
+    protected void onReloadNotification(int notificationCode) {
+        if (notificationCode == PlaybackService.EXTRA_CODE_CAST) {
+            Log.d(TAG, "ReloadNotification received, switching to Castplayer now");
+            finish();
+            startActivity(new Intent(this, CastplayerActivity.class));
+
+        } else {
+            super.onReloadNotification(notificationCode);
+        }
+    }
 }