Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

check if dict missing and warn rather than do anything that will crash

Browse source 
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?
This commit is contained in:
Andy2 2010-11-18 19:00:49 -08:00
parent 7921ddca10
commit 198534dce3
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

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