Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Eric House 2022-08-09 22:39:18 -05:00
parent 518fcc4a70
commit 0497a456e7
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -2310,7 +2310,6 @@ public class BoardDelegate extends DelegateBase
runOnUiThread( new Runnable() { runOnUiThread( new Runnable() {
@Override @Override
public void run() { public void run() {
Log.d( TAG, "makeJNIHandler(): handling GAME_OVER" );
Assert.assertTrueNR( m_jniGamePtr.isRetained() ); Assert.assertTrueNR( m_jniGamePtr.isRetained() );
if ( m_jniGamePtr.isRetained() ) { if ( m_jniGamePtr.isRetained() ) {
boolean hasPending = 0 < XwJNI. boolean hasPending = 0 < XwJNI.

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

@ -794,7 +794,8 @@ public class DictBrowseDelegate extends DelegateBase
{ {
if ( ! m_filterAlertShown ) { if ( ! m_filterAlertShown ) {
m_filterAlertShown = true; m_filterAlertShown = true;
makeNotAgainBuilder( R.string.key_na_newFeatureFilter, R.string.new_feature_filter ) makeNotAgainBuilder( R.string.key_na_newFeatureFilter,
R.string.new_feature_filter )
.setActionPair( Action.SHOW_FAQ, R.string.button_faq ) .setActionPair( Action.SHOW_FAQ, R.string.button_faq )
.setParams( (Object)FAQ_PARAMS ) .setParams( (Object)FAQ_PARAMS )
.show(); .show();

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

@ -2779,7 +2779,8 @@ public class GamesListDelegate extends ListDelegateBase
String langName = DictLangCache String langName = DictLangCache
.getLangNameForISOCode( m_activity, isoCode ); .getLangNameForISOCode( m_activity, isoCode );
makeConfirmThenBuilder( Action.DWNLD_LOC_DICT, makeConfirmThenBuilder( Action.DWNLD_LOC_DICT,
R.string.confirm_get_locdict_fmt, langName ) R.string.confirm_get_locdict_fmt,
langName )
.setPosButton( R.string.button_download ) .setPosButton( R.string.button_download )
.setNegButton( R.string.button_no ) .setNegButton( R.string.button_no )
.setNAKey( R.string.key_got_langdict ) .setNAKey( R.string.key_got_langdict )

2
xwords4/common/server.c
View file

@ -2715,7 +2715,7 @@ nextTurn( ServerCtxt* server, XWEnv xwe, XP_S16 nxtTurn )
if ( NULL != server->nv._prevMoveStream && XWSTATE_NEED_SHOWSCORE != server->nv.gameState ) { if ( NULL != server->nv._prevMoveStream && XWSTATE_NEED_SHOWSCORE != server->nv.gameState ) {
if ( inDuplicateMode(server) || server->nv.showRobotScores ) { if ( inDuplicateMode(server) || server->nv.showRobotScores ) {
server->nv.stateAfterShow = server->nv.gameState; server->nv.stateAfterShow = server->nv.gameState;
SETSTATE( server, XWSTATE_NEED_SHOWSCORE ); /* here? */ SETSTATE( server, XWSTATE_NEED_SHOWSCORE );
moreToDo = XP_TRUE; moreToDo = XP_TRUE;
} else { } else {
XP_ASSERT( 0 ); XP_ASSERT( 0 );