From b46b2247b46f36f28e14e536c9f8ce605091b015 Mon Sep 17 00:00:00 2001 From: Domingos Lopes Date: Fri, 3 Jun 2016 16:44:19 -0400 Subject: fixes NPE from #1974 --- .../de/danoeh/antennapod/activity/CastEnabledActivity.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'app') 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..1b6126d24 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!"); + mediaRouteActionProvider = null; + return true; + } + mediaRouteActionProvider = castManager.addMediaRouterButton(mediaRouteButton); + if (mediaRouteActionProvider != null) { + mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable()); + } return true; } -- cgit v1.2.3 From 6036f2d960dc45d847816d8fa90fce5a2650df75 Mon Sep 17 00:00:00 2001 From: Domingos Lopes Date: Fri, 3 Jun 2016 17:07:17 -0400 Subject: print stack trace with the log entries --- .../play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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 1b6126d24..87304b3d6 100644 --- a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java +++ b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java @@ -69,7 +69,7 @@ public abstract class CastEnabledActivity extends AppCompatActivity super.onPrepareOptionsMenu(menu); 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!"); + Log.wtf(TAG, "MediaRoute item could not be found on the menu!", new Exception()); mediaRouteActionProvider = null; return true; } -- cgit v1.2.3