PlaybackService crashed when media file was incorrect/not found

2 files changed, 19 insertions, 12 deletions

diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 7c306984c..12c005765 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -1282,18 +1282,20 @@ public class PlaybackService extends Service {
 			isPlaying = true;
 		}
 
-		Intent i = new Intent(AVRCP_ACTION_PLAYER_STATUS_CHANGED);
-		i.putExtra("id", 1);
-		i.putExtra("artist", "");
-		i.putExtra("album", media.getFeedTitle());
-		i.putExtra("track", media.getEpisodeTitle());
-		i.putExtra("playing", isPlaying);
-        if (queue != null) {
-            i.putExtra("ListSize", queue.size());
+        if (media != null) {
+		    Intent i = new Intent(AVRCP_ACTION_PLAYER_STATUS_CHANGED);
+		    i.putExtra("id", 1);
+		    i.putExtra("artist", "");
+		    i.putExtra("album", media.getFeedTitle());
+		    i.putExtra("track", media.getEpisodeTitle());
+		    i.putExtra("playing", isPlaying);
+            if (queue != null) {
+                i.putExtra("ListSize", queue.size());
+            }
+            i.putExtra("duration", media.getDuration());
+		    i.putExtra("position", media.getPosition());
+		    sendBroadcast(i);
         }
-        i.putExtra("duration", media.getDuration());
-		i.putExtra("position", media.getPosition());
-		sendBroadcast(i);
 	}
 
 	/**
diff --git a/src/de/danoeh/antennapod/util/playback/ExternalMedia.java b/src/de/danoeh/antennapod/util/playback/ExternalMedia.java
index 1ada0ec03..c08b221f9 100644
--- a/src/de/danoeh/antennapod/util/playback/ExternalMedia.java
+++ b/src/de/danoeh/antennapod/util/playback/ExternalMedia.java
@@ -80,8 +80,13 @@ public class ExternalMedia implements Playable {
 				.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE);
 		feedTitle = mmr
 				.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUM);
-		duration = Integer.parseInt(mmr
+        try {
+		    duration = Integer.parseInt(mmr
 				.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION));
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            throw new PlayableException("NumberFormatException when reading duration of media file");
+        }
 		ChapterUtils.loadChaptersFromFileUrl(this);
 	}