Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-08 20:46:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't offer to upgrade built-in wordlists

Browse source
This commit is contained in:
Eric House 2024-02-09 14:36:31 -08:00
parent 4b470f5e0f
commit 49ade38aca
1 changed files with 93 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -1423,23 +1423,10 @@ public class DictsDelegate extends ListDelegateBase
stopProgress(); stopProgress();
} }
private boolean digestData( String jsonData ) private Set<String> parseLangs( JSONArray langs ) throws JSONException
{ {
boolean success = false;
JSONArray langs = null;
m_needUpdates = new HashMap<>();
if ( null != jsonData ) {
Set<String> closedLangs = new HashSet<>(); Set<String> closedLangs = new HashSet<>();
final Set<String> curLangs = Set<String> curLangs = new HashSet<>( Arrays.asList( m_langs ) );
new HashSet<>( Arrays.asList( m_langs ) );
// DictLangCache hits the DB hundreds of times below. Fix!
Log.w( TAG, "Fix me I'm stupid" );
try {
// Log.d( TAG, "digestData(%s)", jsonData );
JSONObject obj = new JSONObject( jsonData );
langs = obj.optJSONArray( "langs" );
int nLangs = langs.length(); int nLangs = langs.length();
m_remoteInfo = new HashMap<>(); m_remoteInfo = new HashMap<>();
@ -1519,11 +1506,29 @@ public class DictsDelegate extends ListDelegateBase
m_remoteInfo.put( localLangName, asArray ); m_remoteInfo.put( localLangName, asArray );
} }
} }
return closedLangs;
}
private boolean digestData( String jsonData )
{
boolean success = false;
// JSONArray langs = null;
m_needUpdates = new HashMap<>();
if ( null != jsonData ) {
// DictLangCache hits the DB hundreds of times below. Fix!
Log.w( TAG, "Fix me I'm stupid" );
try {
Log.d( TAG, "digestData(%s)", jsonData );
JSONObject obj = new JSONObject( jsonData );
JSONArray langs = obj.optJSONArray( "langs" );
if ( null != langs ) {
Set<String> closedLangs = parseLangs( langs );
closedLangs.remove( m_filterLang ); closedLangs.remove( m_filterLang );
m_closedLangs.addAll( closedLangs ); m_closedLangs.addAll( closedLangs );
success = true; success = true;
}
} catch ( JSONException ex ) { } catch ( JSONException ex ) {
Log.ex( TAG, ex ); Log.ex( TAG, ex );
} }