diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java index 26e570c4d..05e50ab2e 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java @@ -149,7 +149,6 @@ public class DBHelper extends SQLiteOpenHelper { db.execSQL( "CREATE TABLE " + TABLE_NAME_DICTBROWSE + " (" + DICTNAME + " TEXT," - + WORDCOUNT + " INTEGER," + WORDCOUNTS + " TEXT," + ITERMIN + " INTEGER(4)," + ITERMAX + " INTEGER(4)," diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java index 52a024977..64c2b0d39 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java @@ -91,7 +91,6 @@ public class DBUtils { public int m_pos; public int m_top; public String m_prefix; - public int m_count; public int[] m_counts; } @@ -981,8 +980,6 @@ public class DBUtils { result.m_prefix = cursor.getString( cursor .getColumnIndex(DBHelper.ITERPREFIX)); - result.m_count = - cursor.getInt( cursor.getColumnIndex(DBHelper.WORDCOUNT)); String counts = cursor.getString( cursor.getColumnIndex(DBHelper.WORDCOUNTS)); if ( null != counts ) { @@ -1013,7 +1010,6 @@ public class DBUtils { values.put( DBHelper.ITERMIN, state.m_minShown ); values.put( DBHelper.ITERMAX, state.m_maxShown ); values.put( DBHelper.ITERPREFIX, state.m_prefix ); - values.put( DBHelper.WORDCOUNT, state.m_count ); if ( null != state.m_counts ) { String[] nums = new String[state.m_counts.length]; for ( int ii = 0; ii < nums.length; ++ii ) { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java index 116283703..77612120c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictBrowseActivity.java @@ -174,8 +174,6 @@ public class DictBrowseActivity extends XWListActivity m_browseState = new DBUtils.DictBrowseState(); m_browseState.m_pos = 0; m_browseState.m_top = 0; - m_browseState.m_count = - XwJNI.dict_iter_wordCount( m_dictClosure ); } if ( null == m_browseState.m_counts ) { m_browseState.m_counts =