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

reset SMSResend timer on new data only

Browse source 
Resetting it on every ACK etc meant it happened forever at the most
frequent interval, at least on devices that have both sides of a game,
which is my usual test setup.
This commit is contained in:
Eric House 2017-06-20 19:19:03 -07:00
parent e6454070a6
commit b33df6b222
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
View file

@ -523,7 +523,9 @@ public class SMSService extends XWService {
int gameID = dis.readInt();
byte[] rest = new byte[dis.available()];
dis.read( rest );
feedMessage( gameID, rest, new CommsAddrRec( phone ) );
if ( feedMessage( gameID, rest, new CommsAddrRec( phone ) ) ) {
SMSResendReceiver.resetTimer( this );
}
break;
case DEATH:
gameID = dis.readInt();
@ -538,8 +540,6 @@ public class SMSService extends XWService {
Log.w( TAG, "unexpected cmd %s", cmd.toString() );
break;
}
SMSResendReceiver.resetTimer( this );
} catch ( java.io.IOException ioe ) {
Log.ex( TAG, ioe );
}
@ -708,12 +708,13 @@ public class SMSService extends XWService {
return success;
}
private void feedMessage( int gameID, byte[] msg, CommsAddrRec addr )
private boolean feedMessage( int gameID, byte[] msg, CommsAddrRec addr )
{
ReceiveResult rslt = receiveMessage( this, gameID, null, msg, addr );
if ( ReceiveResult.GAME_GONE == rslt ) {
sendDiedPacket( addr.sms_phone, gameID );
}
return rslt == ReceiveResult.OK;
}
private void registerReceivers()