diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 6a147a98c..d1c4972e8 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -2139,7 +2139,7 @@ Change the name of this group to: Name group - The group for new games + The group for new games, %s, cannot be deleted. Moving is impossible until there diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java index ac3e65752..0913df362 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java @@ -827,6 +827,7 @@ public class GamesList extends XWExpandableListActivity byte[] stream = GameUtils.savedGame( this, selRowIDs[0] ); GameLock lock = GameUtils.saveNewGame( this, stream ); DBUtils.saveSummary( this, lock, summary ); + m_selGames.add( lock.getRowid() ); lock.unlock(); } break; @@ -838,6 +839,7 @@ public class GamesList extends XWExpandableListActivity break; case R.id.list_item_rename: + keepSels = true; m_rowid = selRowIDs[0]; showDialog( RENAME_GAME ); break; @@ -845,9 +847,11 @@ public class GamesList extends XWExpandableListActivity // Group menus case R.id.list_group_delete: keepSels = true; - if ( m_selGroupIDs - .contains( XWPrefs.getDefaultNewGameGroup( this ) ) ) { - showOKOnlyDialog( R.string.cannot_delete_default_group ); + long dftGroup = XWPrefs.getDefaultNewGameGroup( this ); + if ( m_selGroupIDs.contains( dftGroup ) ) { + msg = getString( R.string.cannot_delete_default_groupf, + m_adapter.groupName( dftGroup ) ); + showOKOnlyDialog( msg ); } else { long[] groupIDs = getSelGroupIDs(); Assert.assertTrue( 0 < groupIDs.length );