Merge pull request #2044 from mfietz/issue/2043-mediaplayeract-npe1.6.1.2

MediaplayerActivity & MediaplayerInfoActivity: Prevent NPEs

2 files changed, 8 insertions, 9 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index ce8672b59..6803bd91d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -630,17 +630,16 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
      */
     protected boolean loadMediaInfo() {
         Log.d(TAG, "loadMediaInfo()");
+        if(controller == null || controller.getMedia() == null) {
+            return false;
+        }
         Playable media = controller.getMedia();
         SharedPreferences prefs = getSharedPreferences(PREFS, MODE_PRIVATE);
         showTimeLeft = prefs.getBoolean(PREF_SHOW_TIME_LEFT, false);
-        if (media != null) {
-            onPositionObserverUpdate();
-            checkFavorite();
-            updatePlaybackSpeedButton();
-            return true;
-        } else {
-            return false;
-        }
+        onPositionObserverUpdate();
+        checkFavorite();
+        updatePlaybackSpeedButton();
+        return true;
     }
 
     protected void updatePlaybackSpeedButton() {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 647745e39..3be881ccc 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -277,7 +277,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         if (!super.loadMediaInfo()) {
             return false;
         }
-        if(controller.getMedia() != media) {
+        if(controller != null && controller.getMedia() != media) {
             media = controller.getMedia();
             pagerAdapter.onMediaChanged(media);
         }