Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't crash when first run without network connection

Browse source
This commit is contained in:
Eric House 2015-08-03 05:25:10 -07:00
parent 013e0e3a4c
commit 3064420c78
2 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -1140,50 +1140,53 @@ public class DictsDelegate extends ListDelegateBase
JSONObject theOne = null;
String langName = null;
String json = NetUtils.runPost( post, new JSONObject() );
try {
JSONObject obj = new JSONObject( json );
JSONArray langs = obj.optJSONArray( "langs" );
int nLangs = langs.length();
for ( int ii = 0; ii < nLangs; ++ii ) {
JSONObject langObj = langs.getJSONObject( ii );
String langCode = langObj.getString( "lc" );
if ( ! langCode.equals( m_lc ) ) {
continue;
}
// we have our language; look for one marked default;
// otherwise take the largest.
m_langName = langObj.getString( "lang" );
JSONArray dicts = langObj.getJSONArray( "dicts" );
int nDicts = dicts.length();
int theOneNWords = 0;
for ( int jj = 0; jj < nDicts; ++jj ) {
JSONObject dict = dicts.getJSONObject( jj );
if ( dict.optBoolean( "isDflt", false ) ) {
theOne = dict;
break;
} else {
int nWords = dict.getInt( "nWords" );
if ( null == theOne || nWords > theOneNWords ) {
if ( null != json ) {
try {
JSONObject obj = new JSONObject( json );
JSONArray langs = obj.optJSONArray( "langs" );
int nLangs = langs.length();
for ( int ii = 0; ii < nLangs; ++ii ) {
JSONObject langObj = langs.getJSONObject( ii );
String langCode = langObj.getString( "lc" );
if ( ! langCode.equals( m_lc ) ) {
continue;
}
// we have our language; look for one marked default;
// otherwise take the largest.
m_langName = langObj.getString( "lang" );
JSONArray dicts = langObj.getJSONArray( "dicts" );
int nDicts = dicts.length();
int theOneNWords = 0;
for ( int jj = 0; jj < nDicts; ++jj ) {
JSONObject dict = dicts.getJSONObject( jj );
if ( dict.optBoolean( "isDflt", false ) ) {
theOne = dict;
theOneNWords = nWords;
break;
} else {
int nWords = dict.getInt( "nWords" );
if ( null == theOne
|| nWords > theOneNWords ) {
theOne = dict;
theOneNWords = nWords;
}
}
}
}
}
// If we got here and theOne isn't set, there is
// no wordlist available for this language. Set
// the flag so we don't try again, even though
// we've failed.
if ( null == theOne ) {
XWPrefs.setPrefsBoolean( m_context,
R.string.key_got_langdict,
true );
}
// If we got here and theOne isn't set, there is
// no wordlist available for this language. Set
// the flag so we don't try again, even though
// we've failed.
if ( null == theOne ) {
XWPrefs.setPrefsBoolean( m_context,
R.string.key_got_langdict,
true );
}
} catch ( JSONException ex ) {
DbgUtils.loge( ex );
theOne = null;
} catch ( JSONException ex ) {
DbgUtils.loge( ex );
theOne = null;
}
}
if ( null != theOne ) {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
View file

@ -234,6 +234,8 @@ public class NetUtils {
}
} catch( java.io.UnsupportedEncodingException uee ) {
DbgUtils.loge( uee );
} catch( java.net.UnknownHostException uhe ) {
DbgUtils.loge( uhe );
} catch( java.io.IOException ioe ) {
DbgUtils.loge( ioe );
}