From 34e72f171770872e5df07c068b66705f9f553e44 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Wed, 12 Dec 2012 20:17:00 +0100
Subject: [PATCH] avoid crashing if we got empty/null values

---
 AndroidManifest.xml                                    | 4 ++--
 src/ch/blinkenlights/android/vanilla/MediaAdapter.java | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 705af8ec..006213e3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,8 +23,8 @@ THE SOFTWARE.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="ch.blinkenlights.android.vanilla"
-	android:versionName="0.9.15"
-	android:versionCode="0915"
+	android:versionName="0.9.16"
+	android:versionCode="0916"
 	android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="16" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index 814726f6..06a66366 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -493,6 +493,8 @@ public class MediaAdapter
 		if (mFields.length > 1) {
 			String line1 = cursor.getString(1);
 			String line2 = cursor.getString(2);
+			if(line1 == null) { line1 = "???"; }
+			if(line2 == null) { line2 = "???"; }
 			SpannableStringBuilder sb = new SpannableStringBuilder(line1);
 			sb.append('\n');
 			sb.append(line2);
@@ -501,6 +503,7 @@ public class MediaAdapter
 			holder.title = line1;
 		} else {
 			String title = cursor.getString(1);
+			if(title == null) { title = "???"; }
 			holder.text.setText(title);
 			holder.title = title;
 		}