From 198534dce32368de1172f3b92f943005ceefb655 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand.private.network>
Date: Thu, 18 Nov 2010 19:00:49 -0800
Subject: [PATCH] check if dict missing and warn rather than do anything that
 will crash if it's not there.  Ideally I could open the config dialog so user
 could change the dict but that isn't working.  Maybe just offer to open it
 after swapping in the default dict?

---
 .../org/eehouse/android/xw4/GamesList.java    | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index aed60364d..069c9898c 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -279,11 +279,13 @@ public class GamesList extends XWListActivity
             }
             GameUtils.doConfig( this, path, clazz );
         } else {
-            File file = new File( path );
-            Uri uri = Uri.fromFile( file );
-            Intent intent = new Intent( Intent.ACTION_EDIT, uri,
-                                        this, BoardActivity.class );
-            startActivity( intent );
+            if ( checkWarnNoDict( path ) ) {
+                File file = new File( path );
+                Uri uri = Uri.fromFile( file );
+                Intent intent = new Intent( Intent.ACTION_EDIT, uri,
+                                            this, BoardActivity.class );
+                startActivity( intent );
+            }
         }
         m_invalPath = path;
     }
@@ -306,13 +308,7 @@ public class GamesList extends XWListActivity
             showConfirmThen( R.string.confirm_delete, lstnr );
         } else {
             String invalPath = null;
-            String[] missingName = new String[1];
-            int[] missingLang = new int[1];
-            boolean hasDict = GameUtils.gameDictHere( this, path, 
-                                                      missingName, missingLang );
-            if ( !hasDict ) {
-                showNoDict( missingName[0], missingLang[0] );
-            } else {
+            if ( checkWarnNoDict( path ) ) {
                 switch ( menuID ) {
                 case R.id.list_item_reset:
                     lstnr = new DialogInterface.OnClickListener() {
@@ -371,6 +367,18 @@ public class GamesList extends XWListActivity
         return handled;
     } // handleMenuItem
 
+    private boolean checkWarnNoDict( String path )
+    {
+        String[] missingName = new String[1];
+        int[] missingLang = new int[1];
+        boolean hasDict = GameUtils.gameDictHere( this, path, 
+                                                  missingName, missingLang );
+        if ( !hasDict ) {
+            showNoDict( missingName[0], missingLang[0] );
+        }
+        return hasDict;
+    }
+
     private String saveNew( CurGameInfo gi )
     {
         String path = null;
@@ -388,5 +396,4 @@ public class GamesList extends XWListActivity
         onContentChanged();
         return path;
     }
-
 }