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

fix assertion: don't pass bundle as alert param

Browse source 
it's not serializable, and more's the point is already being saved
across rotations in the delegate, so just use that.
This commit is contained in:
Eric House 2017-05-09 07:02:12 -07:00
parent a6d5f409cb
commit 098de83b04
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -884,14 +884,13 @@ public class GamesListDelegate extends ListDelegateBase
break;
case GAMES_LIST_NAME_REMATCH: {
Bundle rematchExtras = (Bundle)params[0];
LinearLayout view = (LinearLayout)
LocUtils.inflate( m_activity, R.layout.msg_label_and_edit );
int iconResID = R.drawable.sologame__gen;
if ( null != rematchExtras ) {
if ( null != m_rematchExtras ) {
EditText edit = (EditText)view.findViewById( R.id.edit );
edit.setText( rematchExtras.getString( REMATCH_NEWNAME_EXTRA ));
boolean solo = rematchExtras.getBoolean( REMATCH_IS_SOLO, true );
edit.setText( m_rematchExtras.getString( REMATCH_NEWNAME_EXTRA ));
boolean solo = m_rematchExtras.getBoolean( REMATCH_IS_SOLO, true );
if ( !solo ) {
iconResID = R.drawable.multigame__gen;
}
@ -921,7 +920,6 @@ public class GamesListDelegate extends ListDelegateBase
return dialog;
} // makeDialog
private void enableMoveGroupButton( DialogInterface dlgi )
{
((AlertDialog)dlgi)
@ -2149,7 +2147,7 @@ public class GamesListDelegate extends ListDelegateBase
{
if ( -1 != intent.getLongExtra( REMATCH_ROWID_EXTRA, -1 ) ) {
m_rematchExtras = intent.getExtras();
showDialogFragment( DlgID.GAMES_LIST_NAME_REMATCH, intent.getExtras() );
showDialogFragment( DlgID.GAMES_LIST_NAME_REMATCH );
}
}