avoid crashing if we got empty/null values

This commit is contained in:
Adrian Ulrich 2012-12-12 20:17:00 +01:00
parent 9547499d65
commit 34e72f1717
2 changed files with 5 additions and 2 deletions

View File

@ -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" />

View File

@ -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;
}