Extended error messages and additional null checks.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index b5451a79d1d561c85b3dac2a404b420997761540..14aa4ff15d0a00375771bfe9aefc18cfc884a136 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -836,7 +836,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 final LinearLayout result = new LinearLayout(parent.getContext());
 
-                for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
+                for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
                     final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
                                         dictionaryInfo, indexInfo, application.languageButtonPixels);