diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-13 20:10:03 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-13 20:10:03 -0400 |
| commit | 7af9b9a0df11cedeb9f2de277920243fc9d251cd (patch) | |
| tree | eef819322c895759c4d77c26ec94d3e9d9db0722 | |
| parent | 4e6abd997a045783a0582d1f939e8c3c1f60a0a6 (diff) | |
| parent | 17c29adfad61395e62eedc8800a66d0126b867f0 (diff) | |
| download | AntennaPod-7af9b9a0df11cedeb9f2de277920243fc9d251cd.zip | |
Merge pull request #1202 from TomHennen/chapter_npe
Resolves NullPointerException when dealing with chapters
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 10ab1a01d..7ee5c880a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.danoeh.antennapod" - android:versionCode="1030400" - android:versionName="1.3.4.0"> + android:versionCode="1030401" + android:versionName="1.3.4.1"> <!-- Version code schema: "1.2.3-SNAPSHOT" -> 1020300 diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java index 67fb4c3b1..22c15949a 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java @@ -163,9 +163,11 @@ public class ChapterListAdapter extends ArrayAdapter<Chapter> { public int getCount() { // ignore invalid chapters int counter = 0; - for (Chapter chapter : chapters) { - if (!ignoreChapter(chapter)) { - counter++; + if (chapters != null) { + for (Chapter chapter : chapters) { + if (!ignoreChapter(chapter)) { + counter++; + } } } return counter; |