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

remove incorrect assertion

Browse source 
DELETE_DICT Action is expected to flow through child, at least until I
fix to disable deleting a dict while it's open in the dict browser. It
may be confusing but with the assert gone does no harm.
This commit is contained in:
Eric House 2017-04-08 11:40:54 -07:00
parent 1f3d1cbb79
commit b07fd2699c
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
View file

@ -302,9 +302,19 @@ public class DictBrowseDelegate extends DelegateBase
@Override @Override
public boolean onPosButton( Action action, Object[] params ) public boolean onPosButton( Action action, Object[] params )
{ {
Assert.assertTrue( !BuildConfig.DEBUG || Action.FINISH_ACTION==action ); boolean handled = false;
finish(); switch( action ) {
return true; case DELETE_DICT_ACTION:
// This comes in from parent
break;
case FINISH_ACTION:
handled = true;
finish();
break;
default:
Assert.assertTrue( !BuildConfig.DEBUG );
}
return handled;
} }
private void findButtonClicked() private void findButtonClicked()

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -622,7 +622,7 @@ public class DictsDelegate extends ListDelegateBase
boolean handled = true; boolean handled = true;
switch ( item.getItemId() ) { switch ( item.getItemId() ) {
case R.id.dicts_delete: case R.id.dicts_delete: // ideally, disable me when dictbrowse open
deleteSelected(); deleteSelected();
break; break;
case R.id.dicts_move: case R.id.dicts_move: