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

create myGames group only on upgrade and only if there are existing games to put into it.

Browse source
This commit is contained in:
Eric House 2014-02-05 19:46:42 -08:00
parent ca57da44c6
commit f6a1e06d41
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
View file

@ -182,7 +182,7 @@ public class DBHelper extends SQLiteOpenHelper {
createTable( db, TABLE_NAME_DICTINFO, s_dictInfoColsAndTypes ); createTable( db, TABLE_NAME_DICTINFO, s_dictInfoColsAndTypes );
createTable( db, TABLE_NAME_DICTBROWSE, s_dictBrowseColsAndTypes ); createTable( db, TABLE_NAME_DICTBROWSE, s_dictBrowseColsAndTypes );
forceRowidHigh( db, TABLE_NAME_SUM ); forceRowidHigh( db, TABLE_NAME_SUM );
createGroupsTable( db ); createGroupsTable( db, false );
createStudyTable( db ); createStudyTable( db );
} }
@ -217,7 +217,7 @@ public class DBHelper extends SQLiteOpenHelper {
addSumColumn( db, LASTMOVE ); addSumColumn( db, LASTMOVE );
case 14: case 14:
addSumColumn( db, GROUPID ); addSumColumn( db, GROUPID );
createGroupsTable( db ); createGroupsTable( db, true );
case 15: case 15:
moveToCurGames( db ); moveToCurGames( db );
case 16: case 16:
@ -271,25 +271,32 @@ public class DBHelper extends SQLiteOpenHelper {
db.execSQL( query.toString() ); db.execSQL( query.toString() );
} }
private void createGroupsTable( SQLiteDatabase db ) private void createGroupsTable( SQLiteDatabase db, boolean isUpgrade )
{ {
// Do we have any existing games we'll be grouping?
if ( isUpgrade ) {
isUpgrade = 0 < countGames( db );
}
createTable( db, TABLE_NAME_GROUPS, s_groupsSchema ); createTable( db, TABLE_NAME_GROUPS, s_groupsSchema );
// Create an empty group name // Create an empty group name
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put( GROUPNAME, m_context.getString(R.string.group_cur_games) ); if ( isUpgrade ) {
values.put( EXPANDED, 1 ); values.put( GROUPNAME, m_context.getString(R.string.group_cur_games) );
long curGroup = db.insert( TABLE_NAME_GROUPS, null, values ); values.put( EXPANDED, 1 );
long curGroup = db.insert( TABLE_NAME_GROUPS, null, values );
// place all existing games in the initial unnamed group
values = new ContentValues();
values.put( GROUPID, curGroup );
db.update( DBHelper.TABLE_NAME_SUM, values, null, null );
}
values = new ContentValues(); values = new ContentValues();
values.put( GROUPNAME, m_context.getString(R.string.group_new_games) ); values.put( GROUPNAME, m_context.getString(R.string.group_new_games) );
values.put( EXPANDED, 1 ); values.put( EXPANDED, 1 );
long newGroup = db.insert( TABLE_NAME_GROUPS, null, values ); long newGroup = db.insert( TABLE_NAME_GROUPS, null, values );
// place all existing games in the initial unnamed group
values = new ContentValues();
values.put( GROUPID, curGroup );
db.update( DBHelper.TABLE_NAME_SUM, values, null, null );
XWPrefs.setDefaultNewGameGroup( m_context, newGroup ); XWPrefs.setDefaultNewGameGroup( m_context, newGroup );
} }
@ -382,4 +389,17 @@ public class DBHelper extends SQLiteOpenHelper {
query = String.format( "DELETE FROM %s", name ); query = String.format( "DELETE FROM %s", name );
db.execSQL( query ); db.execSQL( query );
} }
private int countGames( SQLiteDatabase db )
{
final String query = "SELECT COUNT(*) FROM " + TABLE_NAME_SUM;
Cursor cursor = db.rawQuery( query, null );
cursor.moveToFirst();
int result = cursor.getInt(0);
cursor.close();
DbgUtils.logf( "countGames()=>%d", result );
return result;
}
} }