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

fix timer-draw NPE due to race condition

Browse source 
use runOnUiThread()....
This commit is contained in:
Eric House 2017-09-19 22:09:57 -07:00
parent a328221b63
commit 39efbaa7f5
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
View file

@ -322,26 +322,35 @@ public class BoardCanvas extends Canvas implements DrawCtx {
}
}
public void drawTimer( Rect rect, int player, int secondsLeft )
public void drawTimer( Rect rect, final int player,
int secondsLeft )
{
if ( null != m_jniThread &&
(m_lastSecsLeft != secondsLeft || m_lastTimerPlayer != player) ) {
m_lastSecsLeft = secondsLeft;
m_lastTimerPlayer = player;
if ( m_lastSecsLeft != secondsLeft || m_lastTimerPlayer != player ) {
final Rect rectCopy = new Rect(rect);
final int secondsLeftCopy = secondsLeft;
m_activity.runOnUiThread( new Runnable() {
@Override
public void run() {
if ( null != m_jniThread ) {
m_lastSecsLeft = secondsLeftCopy;
m_lastTimerPlayer = player;
String negSign = secondsLeft < 0? "-":"";
secondsLeft = Math.abs( secondsLeft );
String time = String.format( "%s%d:%02d", negSign, secondsLeft/60,
secondsLeft%60 );
String negSign = secondsLeftCopy < 0? "-":"";
int secondsLeft = Math.abs( secondsLeftCopy );
String time =
String.format( "%s%d:%02d", negSign,
secondsLeft/60, secondsLeft%60 );
fillRectOther( rect, CommonPrefs.COLOR_BACKGRND );
m_fillPaint.setColor( m_playerColors[player] );
fillRectOther( rectCopy, CommonPrefs.COLOR_BACKGRND );
m_fillPaint.setColor( m_playerColors[player] );
Rect shorter = new Rect( rect );
shorter.inset( 0, shorter.height() / 5 );
drawCentered( time, shorter, null );
rectCopy.inset( 0, rectCopy.height() / 5 );
drawCentered( time, rectCopy, null );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW );
m_jniThread.handle( JNIThread.JNICmd.CMD_DRAW );
}
}
} );
}
}