Merge pull request #1981 from domingos86/null-action-provider-workaround

fixes CastManager.addMediaRouterButton NPE

1 files changed, 10 insertions, 3 deletions

diff --git a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
index b8856c295..87304b3d6 100644
--- a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
+++ b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
@@ -67,9 +67,16 @@ public abstract class CastEnabledActivity extends AppCompatActivity
     @CallSuper
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        mediaRouteActionProvider = castManager
-                .addMediaRouterButton(menu.findItem(R.id.media_route_menu_item));
-        mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable());
+        MenuItem mediaRouteButton = menu.findItem(R.id.media_route_menu_item);
+        if (mediaRouteButton == null) {
+            Log.wtf(TAG, "MediaRoute item could not be found on the menu!", new Exception());
+            mediaRouteActionProvider = null;
+            return true;
+        }
+        mediaRouteActionProvider = castManager.addMediaRouterButton(mediaRouteButton);
+        if (mediaRouteActionProvider != null) {
+            mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable());
+        }
         return true;
     }