Extended error messages and additional null checks.

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);

diff --git a/src/com/hughes/android/dictionary/DictionaryInfo.java b/src/com/hughes/android/dictionary/DictionaryInfo.java
index 53a1f7debf0b6306aa4875a8817e02e08fe37c54..81c8f5d687aae2662534f0ebc000f68086292e2a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryInfo.java
+++ b/src/com/hughes/android/dictionary/DictionaryInfo.java
@@ -65,7 +65,7 @@ public class DictionaryInfo implements Serializable {
     }
 
     public boolean isValid() {
-        return !indexInfos.isEmpty();
+        return indexInfos != null && !indexInfos.isEmpty();
     }
 
     public StringBuilder append(final StringBuilder result) {

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 833429ad522c3fa480011d96b3dd958a1e400df4..869bc335999ff9d953c27793d7fe347cd7672d06 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -225,7 +225,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                            Toast.LENGTH_LONG).show();
             result = true;
         } catch (Exception e) {
-            String msg = getString(R.string.unzippingFailed, dest);
+            String msg = getString(R.string.unzippingFailed, dest + ": " + e.getMessage());
             File dir = application.getDictDir();
             if (!dir.canWrite() || !application.checkFileCreate(dir)) {
                 msg = getString(R.string.notWritable, dir.getAbsolutePath());