Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

when deleting a group's games do as when they're deleted individually:

Browse source 
get the lock, tell the relay, and THEN remove from DB.
This commit is contained in:
Eric House 2012-11-20 19:03:39 -08:00
parent 3bff555bfd
commit a199dd2b92
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -310,18 +310,35 @@ public class GameUtils {
return rowid;
}
public static void deleteGame( Context context, long rowid,
boolean informNow )
public static boolean deleteGame( Context context, long rowid,
boolean informNow )
{
DbgUtils.logf( "deleteGame(rowid=%d)", rowid );
boolean success;
// does this need to be synchronized?
GameLock lock = new GameLock( rowid, true );
if ( lock.tryLock() ) {
tellDied( context, lock, informNow );
DBUtils.deleteGame( context, lock );
lock.unlock();
success = true;
} else {
DbgUtils.logf( "deleteGame: unable to delete rowid %d", rowid );
success = false;
}
return success;
}
public static void deleteGroup( Context context, long groupid )
{
int nSuccesses = 0;
long[] rowids = DBUtils.getGroupGames( context, groupid );
for ( int ii = rowids.length - 1; ii >= 0; --ii ) {
if ( deleteGame( context, rowids[ii], ii == 0 ) ) {
++nSuccesses;
}
}
if ( rowids.length == nSuccesses ) {
DBUtils.deleteGroup( context, groupid );
}
}

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

@ -557,7 +557,7 @@ public class GamesList extends XWExpandableListActivity
break;
case DELETE_GROUP_ACTION:
DBUtils.deleteGroup( this, m_groupid );
GameUtils.deleteGroup( this, m_groupid );
onContentChanged();
break;
default: