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

toward working in background: log when called on null thread rather than crashing

Browse source
This commit is contained in:
Eric House 2016-04-06 11:07:30 -07:00
parent 70c0db6504
commit 347ff60434
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -105,17 +105,17 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
m_lastSpacing = MULTI_INACTIVE; m_lastSpacing = MULTI_INACTIVE;
if ( !ConnStatusHandler.handleDown( xx, yy ) ) { if ( !ConnStatusHandler.handleDown( xx, yy ) ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy ); handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy );
} }
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if ( ConnStatusHandler.handleMove( xx, yy ) ) { if ( ConnStatusHandler.handleMove( xx, yy ) ) {
} else if ( MULTI_INACTIVE == m_lastSpacing ) { } else if ( MULTI_INACTIVE == m_lastSpacing ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy ); handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy );
} else { } else {
int zoomBy = figureZoom( event ); int zoomBy = figureZoom( event );
if ( 0 != zoomBy ) { if ( 0 != zoomBy ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_ZOOM, handle( JNIThread.JNICmd.CMD_ZOOM,
zoomBy < 0 ? -2 : 2 ); zoomBy < 0 ? -2 : 2 );
} }
} }
@ -124,12 +124,12 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
if ( ConnStatusHandler.handleUp( xx, yy ) ) { if ( ConnStatusHandler.handleUp( xx, yy ) ) {
// do nothing // do nothing
} else { } else {
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy ); handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy );
} }
break; break;
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
case MotionEvent.ACTION_POINTER_2_DOWN: case MotionEvent.ACTION_POINTER_2_DOWN:
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy ); handle( JNIThread.JNICmd.CMD_PEN_UP, xx, yy );
m_lastSpacing = getSpacing( event ); m_lastSpacing = getSpacing( event );
break; break;
case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_UP:
@ -234,7 +234,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
int fontWidth = int fontWidth =
Math.min(m_defaultFontHt, timerWidth / timerTxt.length()); Math.min(m_defaultFontHt, timerWidth / timerTxt.length());
DbgUtils.logf( "layoutBoardOnce(): posting JNICmd.CMD_LAYOUT(w=%d, h=%d)", width, height ); DbgUtils.logf( "layoutBoardOnce(): posting JNICmd.CMD_LAYOUT(w=%d, h=%d)", width, height );
m_jniThread.handle( JNIThread.JNICmd.CMD_LAYOUT, width, height, handle( JNIThread.JNICmd.CMD_LAYOUT, width, height,
fontWidth, m_defaultFontHt ); fontWidth, m_defaultFontHt );
// We'll be back.... // We'll be back....
} else { } else {
@ -264,8 +264,8 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
} else { } else {
m_canvas.setJNIThread( m_jniThread ); m_canvas.setJNIThread( m_jniThread );
} }
m_jniThread.handle( JNIThread.JNICmd.CMD_SETDRAW, m_canvas ); handle( JNIThread.JNICmd.CMD_SETDRAW, m_canvas );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW ); handle( JNIThread.JNICmd.CMD_DRAW );
// set so we know we're done // set so we know we're done
m_layoutWidth = width; m_layoutWidth = width;
@ -300,7 +300,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
// Set the jni layout if we already have one // Set the jni layout if we already have one
if ( null != m_dims ) { if ( null != m_dims ) {
m_jniThread.handle( JNIThread.JNICmd.CMD_LAYOUT, m_dims ); handle( JNIThread.JNICmd.CMD_LAYOUT, m_dims );
} }
// Make sure we draw. Sometimes when we're reloading after // Make sure we draw. Sometimes when we're reloading after
@ -400,4 +400,13 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
return zoomDir; return zoomDir;
} }
private void handle( JNIThread.JNICmd cmd, Object... args )
{
if ( null == m_jniThread ) {
DbgUtils.logf( "BoardView: not calling handle(%s)", cmd.toString() );
DbgUtils.printStack();
} else {
m_jniThread.handle( cmd, args );
}
}
} }